pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(math/R) Updated 4.3.3 to 4.4.0
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Mon Apr 29 00:39:50 2024 +0900
Changeset: 68c90651d0caf92138899e4dd44b96993c37331c
Modified Files:
R/COMMIT_MSG
R/Makefile
R/PLIST
R/distinfo
R/patches/patch-configure.ac
R/patches/patch-m4_R.m4
Log Message:
(math/R) Updated 4.3.3 to 4.4.0
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=68c90651d0caf92138899e4dd44b96993c37331c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
R/COMMIT_MSG | 247 ++++++++++++++++++++++++++-----------------
R/Makefile | 10 +-
R/PLIST | 201 +++++++++++++++++++++++++++++++++--
R/distinfo | 10 +-
R/patches/patch-configure.ac | 43 ++++++--
R/patches/patch-m4_R.m4 | 31 +++---
6 files changed, 396 insertions(+), 146 deletions(-)
diffs:
diff --git a/R/COMMIT_MSG b/R/COMMIT_MSG
index c1d3aa16df..2a53efd516 100644
--- a/R/COMMIT_MSG
+++ b/R/COMMIT_MSG
@@ -1,99 +1,148 @@
-(math/R) Updated 4.3.2 to 4.3.3
-
-CHANGES IN R 4.3.3:
-
- NEW FEATURES:
-
- * 'iconv()' now fixes up variant encoding names such as
- '"utf8"' case-insensitively.
-
- DEPRECATED AND DEFUNCT:
-
- * The legacy 'encoding = "MacRoman"' is deprecated in 'pdf()'
- and 'postscript()': support was incomplete in earlier
- versions of R.
-
- BUG FIXES:
-
- * Arguments are now properly forwarded to methods on S4
- generics with ... in the middle of their formal arguments.
- This was broken for the case when a method introduced an
- argument but did not include ... in its own formals. Thanks
- to Herv<c3><a9> Pag<c3><a8>s for the report PR#18538.
-
- * Some invalid 'file' arguments to 'pictex()', 'postscript()'
- and 'xfig()' opened a file called 'NA' rather than throw an
- error. These included 'postscript(NULL)' (which some people
- expected to work like 'pdf(NULL)').
-
- * Passing 'filename = NA' to 'svg()', 'cairo_pdf()',
- 'cairo_ps()' or the Cairo-based bitmap devices opened a file
- called 'NA': it now throws an error.
-
- * 'quartz(file = NA)' opened a file called 'NA', including
- when used as a Quartz-based bitmap device. It now gives an
- error.
-
- * 'rank(<long vector>)' now works, fixing PR#18617, thanks to
- Ilia Kats.
-
- * 'seq.int()' did not adequately check its 'length.out'
- argument.
-
- * 'match(<POSIXct>, .)' is correct again for differing time
- zones, ditto for '"POSIXlt"', fixing PR#18618 reported by
- Bastian Klein.
-
- * 'drop.terms(*, dropx = <0-length>)' now works, fixing
- PR#18563 as proposed by Mikael Jagan.
-
- * 'drop.terms(*)' keeps ' + offset(.)' terms when it should,
- PR#18565, and 'drop.terms()' no longer makes up a response,
- PR#18566, fixing both bugs thanks to Mikael Jagan.
-
- * 'getS3method("t", "test")' no longer finds the 't.test()'
- function, fixing PR#18627.
-
- * 'pdf()' and 'postscript()' support for the documented Adobe
- encodings '"Greek"' and '"Cyrilllic"' was missing (although
- the corresponding Windows' codepages could be used).
-
- * Computations of glyph metric information for 'pdf()' and
- 'postscript()' did not take into account that
- transliteration could replace one character by two or more
- (only seen on macOS 14) and typically warned that the
- information was not known.
-
- * 'rank(x)' no longer overflows during integer addition, when
- computing rank average for largish but not-yet long vector
- 'x', fixing PR#18630, thanks to Ilia Kats.
-
- * 'list.files()' on Windows now returns also files with names
- longer that 260 bytes (the Windows limit is 260 characters).
- Previously, some file names particularly with 'East Asian'
- characters were omitted.
-
- * 'cov2cor(<0 x 0>)' now works, fixing PR#18423 thanks to
- Mikael Jagan and Elin Waring.
-
- * 'cov2cor(<negative diagonal>)' and similar now give one
- warning instead of two, with better wording, fixing PR#18424
- thanks to Mikael Jagan.
-
- * 'tools'':: startDynamicHelp()' now ensures 'port' is in
- proper range, fixing PR#18645.
-
- * 'pbeta(x, a,b)' is correct now for 'x'=0 or 1 in the
- boundary cases where 'a' or 'b' or both are 0, fixing
- PR#18672 thanks to Michael Fay.
-
- * 'pmatch(x, table)' for large 'table', also called for data
- frame row selection, 'dfrm[nm, ]', is now interruptible,
- fixing PR#18656.
-
- * 'predict(<rank-deficient lm>, newdata=*)' fix computing of
- 'nbasis', see Russ Lenth's comment 29 in PR#16158.
-
- * Added a work-around for a bug in macOS 14.3.1 and higher
- which prevents R plots in the Quartz Cocoa device from
- updating on screen.
+(math/R) Updated 4.3.3. to 4.4.0
+
+NEWS for R version 4.4.0 (2024-04-24)
+NEWS
+
+R News
+
+CHANGES IN R 4.4.0
+SIGNIFICANT USER-VISIBLE CHANGES:
+* Startup banners, R --version, sessionInfo() and R CMD check no longer report
+(64-bit) as part of the platform as this is almost universal – the increasingly rare
+32-bit platforms will still report (32-bit).
+On Windows, ditto for window titles.
+* is.atomic(NULL) now returns FALSE, as NULL is not an atomic vector.
+Strict back-compatibility would replace is.atomic(foo) by (is.null(foo) ||
+is.atomic(foo)) but should happen only sparingly.
+NEW FEATURES:
+* The confint() methods for "glm" and "nls" objects have been copied to the
+stats package. Previously, they were stubs which called versions in package MASS.
+The MASS namespace is no longer loaded if you invoke (say) confint(glmfit).
+Further, the "glm" method for profile() and the plot() and pairs() methods
+for class "profile" have been copied from MASS to stats. (profile.nls() and
+plot.profile.nls() were already in stats.)
+* The confint() and profile methods for "glm" objects have gained a possibility to
+do profiling based on the Rao Score statistic in addition to the default Likelihood
+Ratio. This is controlled by a new test = argument.
+* The pairs() method for "profile" objects has been extended with a which = argument to allow plotting only a subset of the parameters.
+* The "glm" method for anova() computes test statistics and p-values by default, using
+a chi-squared test or an F test depending on whether the dispersion is fixed or free.
+Test statistics can be suppressed by giving argument test a false logical value.
+* In setRepositories() the repositories can be set using their names via name = instead of index ind =.
+* methods() and .S3methods() gain a all.names option for the (rare) case where
+functions starting with a ‘.’ should be included.
+* Serializations can now be interrupted (e.g., by Ctrl-C on a Unix-alike) if they take
+too long, e.g., from save.image(), thanks to suggestions by Ivan Krylov and others
+on R-devel.
+
+* New startup option ‘--max-connections’ to set the maximum number of simultaneous connections for the session. Defaults to 128 as before: allowed values up to 4096
+(but resource limits may in practice restrict to smaller values).
+* R on Windows (since Windows 10 2004) now uses the new Segment Heap allocator.
+This may improve performance of some memory-intensive applications.
+* When R packages are built, typically by R CMD build <pkg>, the new
+--user=<build_user> option overrides the (internally determined) user name, currently Sys.info()["user"] or LOGNAME. This is a (modified) fulfillment of Will Landau’s suggestion in PR#17530.
+* tools::testInstalledBasic() gets new optional arguments outDir and
+testSrcdir, e.g., allowing to use it in a builddir != srcdir setup, and in standard “binary” Windows installation if a source ‘tests/’ folder is present.
+* range(<DT_with_Inf>, finite = TRUE) now work for objects of class "Date",
+"POSIXct", and "POSIXlt" with infinite entries, analogously to range.default(),
+as proposed by Davis Vaughan on R-devel. Other range()-methods can make use of
+new function .rangeNum().
+* New .internalGenerics object complementing .S3PrimitiveGenerics, for documentation and low-level book-keeping.
+* grid() now invisibly returns the x- and y- coordinates at which the grid-lines were
+drawn.
+* norm(., type) now also works for complex matrices.
+* kappa(., exact = TRUE, norm = *) now works for all norms and also for complex
+matrices. In symmetric / triangular cases, the new argument uplo = "U" | "L" allows
+the upper or lower triangular part to be specified.
+* memDecompress(type = "unknown") recognizes compression in the default ‘zlib’ format as used by memCompress(type = "gzip").
+* memCompress() and memDecompress() will use the libdeflate library (https:
+//github.com/ebiggers/libdeflate) if installed. This uses the same type of compression for type = "gzip" but is 1.5-2x faster than the system libz library on some
+common platforms: the speed-up may depend on the library version.
+* diff() for objects of class "Date", "POSIXct", and "POSIXlt" accepts a units argument passed via ....
+* Dynamic help now does a much better job of rendering package ‘DESCRIPTION’ metadata.
+* Rprof() gains an event argument and support for elapsed (real) time profiling on
+Unix (PR#18076).
+* filled.contour() gains a key.border argument.
+* tools::update_pkg_po() gets arguments pot_make and mo_make for not re-making
+the corresponding files, and additionally a verbose argument.
+* Hexadecimal string colour specifications are now accepted in short form, so, for example, we can use "#123", which is equivalent to "#112233".
+Thanks to MikeFC for the original idea and Ella Kaye, Malcolm Barrett, George
+Stagg, and Hanne Oberman for the patch.
+* Plain-text help shows \var markup by angle brackets.
+* The new experimental primitive function declare() is intended to eventually allow
+information about R code to be communicated to the interpreter, compiler, and code
+analysis tools. The syntax for declarations is still being developed.
+* Functions psmirnov(), qsmirnov() and rsmirnov() in package stats have had argument two.sided renamed to alternative, to take into account that the permutation
+distributions of the one-sided statistics can be different in the case of ties. Consequence of PR#18582.
+
+* sort() is now an implicit S4 generic in methods.
+* Formatting and printing, format(z), print(z), of complex vectors z no longer zap
+relatively small real or imaginary parts to zero, fixing PR#16752. This is an API
+change, as it was documented previously to round real and imaginary parts together
+on purpose, producing nicer looking output. As mentioned, e.g. in the PR, this change
+is compatible with many other “R-like” programming environments.
+We have simplified the internal code and now basically format the real and imaginary
+parts independently of each other.
+* New experimental functions Tailcall() and Exec() to support writing stack-spaceefficient recursive functions.
+* Where characters are attempted to be plotted by pdf(), postscript() and xfig()
+which are not in the selected 8-bit character set (most often Latin-1) and the R session
+is using a UTF-8 locale, the warning messages will show the UTF-8 character rather
+than its bytes and one dot will be substituted per character rather than per byte.
+(Platforms whose iconv() does transliteration silently plot the transliteration.)
+In a UTF-8 locale some transliterations are now done with a warning (e.g., dashes
+and Unicode minus to hyphen, ligatures are expanded, permille (‘‰’) is replaced by
+‘o/oo’), although the OS may have got there first. These are warnings as they will
+continue to be replaced by dots in earlier versions of R.
+* The matrix multiplication functions crossprod() and tcrossprod() are now also
+primitive and S3 generic, as %*% had become in R 4.3.0.
+* source() and example() have a new optional argument catch.aborts which allows
+continued evaluation of the R code after an error.
+* The non-Quartz tiff() devices allow additional types of compression if supported
+by the platform’s ‘libtiff’ library.
+* The list of base and recommended package names is now provided by
+tools::standard_package_names().
+* cairo_pdf() and cairo_ps() default to onefile = TRUE to closer match pdf() and
+postscript().
+* New option catch.script.errors provides a documented way to catch errors and
+then continue in non-interactive use.
+* L %||% R newly in base is an expressive idiom for the phrases if(!is.null(L)) L
+else R or if(is.null(L)) R else L.
+* The return value from warnings() now always inherits from "warnings" as documented, now also in the case of no warnings where it previously returned NULL.
+* as.complex("1i") now returns 0 + 1i instead of NA with a warning.
+* z <- c(NA, 1i) now keeps the imaginary part Im(z[1]) == 0, no longer coercing to
+NA_complex_. Similarly, cumsum(z) correctly sums real and imaginary parts separately, i.e., without “crosstalk” in case of NAs.
+* On Alpine Linux iconv() now maps "latin2", "latin-2", "latin9" and "latin-9"
+to encoding names the OS knows about (case-insensitively).
+* iconv(sub = "Unicode") now always zero-pads to four (hex) digits, rather than to 4
+or 8. (This seems to have become the convention once Unicode restricted the number
+of Unicode points to 221 − 1 and so will never need more than 6 digits.)
+* NCOL(NULL) now returns 0 instead of 1, for consistency with cbind().
+* The information for the Euro glyph missing from the Adobe ‘.afm’ files for the
+Courier, Helvetica and Times families has been copied from their URW equivalents –
+this will improve vertical centring in the pdf() and postscript() devices.
+* The included BLAS sources have been updated to those shipped with LAPACK version 3.12.0. The changes are almost entirely cosmetic.
+
+
+* The included LAPACK sources have been updated to version 3.12.0 and some further
+double-complex routines added.
+* There are new font families for the 2014–5 URW 2.0 fonts (see ?pdf) which are
+included in recent versions of Ghostscript. These have font widths for most Greek
+glyphs and a few others which were missing from the original versions (whose font
+families remain available for reproducibility, although Ghostscript-based viewers will
+render using the 2.0 versions).
+* Improve the large-n efficiency of as.matrix(<dist>), thanks an R contributors effort,
+notably by Tim Taylor and Heather Turner, see PR#18660.
+* The default and numeric methods of all.equal() get a check.class option.
+* zapsmall() gets new optional arguments, function mFUN and min.d, for extra flexibility; fulfills a wish in PR#18199. Also, it is now an implicit S4 generic in package
+methods.
+* The Rd filter for aspell() gains an ignore argument.
+* New generic function sort_by(), primarily useful for the data.frame method which
+can be used to sort rows of a data frame by one or more columns.
+* The icence headers for the RPC code in ‘src/extra/xdr’ have been updated to use
+the GPL-compatible licence published by Oracle America in 2010.
+* New function pkg2HTML() in tools to create single-page HTML reference manuals for
+R packages.
+* The byte code evaluator now uses less C stack space for recursive calls to bytecompiled functions. It also makes more of an effort to avoid allocations for scalar
+return values.
+* New completion option backtick (disabled by default) allows non-syntactic completions to be wrapped in backquotes. This is currently only useful for Jupyter notebooks
+via the IRkernel package, and may cause problems for other backends.
diff --git a/R/Makefile b/R/Makefile
index 1e5d1bdee2..b11c2bb337 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -4,7 +4,7 @@
# If updating this package, please try to ensure PLIST.Darwin is kept in sync
# to avoid unnecessarily breaking macOS users.
#
-DISTNAME= R-4.3.3
+DISTNAME= R-4.4.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-4/}
@@ -149,10 +149,10 @@ INSTALL_SCRIPT= ${INSTALL} ${COPY} -m ${BINMODE}
#TOOL_DEPENDS+= tex-mptopdf-[0-9]*:../../graphics/tex-mptopdf
#TOOL_DEPENDS+= tex-pdftex-def-[0-9]*:../../print/tex-pdftex
-SUBST_CLASSES+= rpath
-SUBST_STAGE.rpath= pre-configure
-SUBST_FILES.rpath= configure.ac
-SUBST_VARS.rpath= COMPILER_RPATH_FLAG
+#SUBST_CLASSES+= rpath
+#SUBST_STAGE.rpath= pre-configure
+#SUBST_FILES.rpath= configure.ac
+#SUBST_VARS.rpath= COMPILER_RPATH_FLAG
SUBST_CLASSES+= fixwrap
SUBST_STAGE.fixwrap= post-build
diff --git a/R/PLIST b/R/PLIST
index 30fc58047e..53f34c649c 100644
--- a/R/PLIST
+++ b/R/PLIST
@@ -56,6 +56,7 @@ lib/R/doc/THANKS
lib/R/doc/html/NEWS.2.html
lib/R/doc/html/NEWS.3.html
lib/R/doc/html/NEWS.html
+lib/R/doc/html/R-nav.css
lib/R/doc/html/R.css
lib/R/doc/html/Rlogo.pdf
lib/R/doc/html/Rlogo.svg
@@ -133,6 +134,7 @@ lib/R/doc/html/katex/katex.js
lib/R/doc/html/left.jpg
lib/R/doc/html/logo.jpg
lib/R/doc/html/mathjax-config.js
+lib/R/doc/html/orcid.svg
lib/R/doc/html/packages-head-utf8.html
lib/R/doc/html/prism.css
lib/R/doc/html/prism.js
@@ -307,11 +309,31 @@ lib/R/library/Matrix/doc/Intro2Matrix.pdf
lib/R/library/Matrix/doc/Introduction.R
lib/R/library/Matrix/doc/Introduction.Rnw
lib/R/library/Matrix/doc/Introduction.pdf
-lib/R/library/Matrix/doc/SuiteSparse/AMD.txt
-lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD.txt
-lib/R/library/Matrix/doc/SuiteSparse/COLAMD.txt
-lib/R/library/Matrix/doc/SuiteSparse/SPQR.txt
-lib/R/library/Matrix/doc/SuiteSparse/SuiteSparse_config.txt
+lib/R/library/Matrix/doc/SuiteSparse/AMD/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/AMD/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/AMD/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/CAMD/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/CAMD/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/CAMD/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/CCOLAMD/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/CCOLAMD/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/CCOLAMD/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/SuiteSparse_metis/Changelog
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/SuiteSparse_metis/LICENSE.txt
+lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD/SuiteSparse_metis/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/COLAMD/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/COLAMD/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/COLAMD/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/CXSparse/Doc/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/CXSparse/Doc/License.txt
+lib/R/library/Matrix/doc/SuiteSparse/CXSparse/README.txt
+lib/R/library/Matrix/doc/SuiteSparse/ChangeLog
+lib/R/library/Matrix/doc/SuiteSparse/LICENSE.txt
+lib/R/library/Matrix/doc/SuiteSparse/README.md
+lib/R/library/Matrix/doc/SuiteSparse/SuiteSparse_config/README.txt
lib/R/library/Matrix/doc/index.html
lib/R/library/Matrix/doc/sparseModels.R
lib/R/library/Matrix/doc/sparseModels.Rnw
@@ -363,6 +385,20 @@ lib/R/library/Matrix/po/lt/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/lt/LC_MESSAGES/R-Matrix.mo
lib/R/library/Matrix/po/pl/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/pl/LC_MESSAGES/R-Matrix.mo
+lib/R/library/Matrix/scripts/AMD.patch
+lib/R/library/Matrix/scripts/CAMD.patch
+lib/R/library/Matrix/scripts/CCOLAMD.patch
+lib/R/library/Matrix/scripts/CHOLMOD.patch
+lib/R/library/Matrix/scripts/COLAMD.patch
+lib/R/library/Matrix/scripts/CXSparse.patch
+lib/R/library/Matrix/scripts/SuiteSparse_config.patch
+lib/R/library/Matrix/scripts/api.patch
+lib/R/library/Matrix/scripts/disclaimer.txt
+lib/R/library/Matrix/scripts/rules.mk
+lib/R/library/Matrix/scripts/rules.sh
+lib/R/library/Matrix/scripts/sources.mk
+lib/R/library/Matrix/scripts/ssget.sh
+lib/R/library/Matrix/scripts/wall.patch
lib/R/library/Matrix/test-tools-1.R
lib/R/library/Matrix/test-tools-Matrix.R
lib/R/library/Matrix/test-tools.R
@@ -615,8 +651,24 @@ lib/R/library/grDevices/afm/Helvetica-Bold.afm.gz
lib/R/library/grDevices/afm/Helvetica-BoldOblique.afm.gz
lib/R/library/grDevices/afm/Helvetica-Oblique.afm.gz
lib/R/library/grDevices/afm/Helvetica.afm.gz
+lib/R/library/grDevices/afm/LICENSE.LPPL
lib/R/library/grDevices/afm/MustRead.html
+lib/R/library/grDevices/afm/NimbusMonoPS-Bold.afm.gz
+lib/R/library/grDevices/afm/NimbusMonoPS-BoldItalic.afm.gz
+lib/R/library/grDevices/afm/NimbusMonoPS-Italic.afm.gz
+lib/R/library/grDevices/afm/NimbusMonoPS-Regular.afm.gz
+lib/R/library/grDevices/afm/NimbusRoman-Bold.afm.gz
+lib/R/library/grDevices/afm/NimbusRoman-BoldItalic.afm.gz
+lib/R/library/grDevices/afm/NimbusRoman-Italic.afm.gz
+lib/R/library/grDevices/afm/NimbusRoman-Regular.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-Bold.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-BoldItalic.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-BoldOblique.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-Italic.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-Oblique.afm.gz
+lib/R/library/grDevices/afm/NimbusSans-Regular.afm.gz
lib/R/library/grDevices/afm/README
+lib/R/library/grDevices/afm/StandardSymbolsPS.afm.gz
lib/R/library/grDevices/afm/Symbol.afm.gz
lib/R/library/grDevices/afm/Times-Bold.afm.gz
lib/R/library/grDevices/afm/Times-BoldItalic.afm.gz
@@ -707,7 +759,6 @@ lib/R/library/grDevices/enc/ISOLatin7.enc
lib/R/library/grDevices/enc/ISOLatin9.enc
lib/R/library/grDevices/enc/KOI8-R.enc
lib/R/library/grDevices/enc/KOI8-U.enc
-lib/R/library/grDevices/enc/MacRoman.enc
lib/R/library/grDevices/enc/PDFDoc.enc
lib/R/library/grDevices/enc/TeXtext.enc
lib/R/library/grDevices/enc/WinAnsi.enc
@@ -724,7 +775,6 @@ lib/R/library/grDevices/html/00Index.html
lib/R/library/grDevices/html/R.css
lib/R/library/grDevices/icc/srgb
lib/R/library/grDevices/icc/srgb.flate
-lib/R/library/grDevices/libs/cairo.so
lib/R/library/grDevices/libs/grDevices.so
lib/R/library/graphics/DESCRIPTION
lib/R/library/graphics/INDEX
@@ -1285,6 +1335,54 @@ lib/R/library/tools/html/00Index.html
lib/R/library/tools/html/R.css
lib/R/library/tools/libs/tools.so
lib/R/library/translations/DESCRIPTION
+lib/R/library/translations/ar/LC_MESSAGES/R-base.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-splines.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-stats4.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-tcltk.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/ar/LC_MESSAGES/R-utils.mo
+lib/R/library/translations/ar/LC_MESSAGES/R.mo
+lib/R/library/translations/ar/LC_MESSAGES/RGui.mo
+lib/R/library/translations/ar/LC_MESSAGES/grDevices.mo
+lib/R/library/translations/ar/LC_MESSAGES/graphics.mo
+lib/R/library/translations/ar/LC_MESSAGES/methods.mo
+lib/R/library/translations/ar/LC_MESSAGES/parallel.mo
+lib/R/library/translations/ar/LC_MESSAGES/splines.mo
+lib/R/library/translations/ar/LC_MESSAGES/stats.mo
+lib/R/library/translations/ar/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/ar/LC_MESSAGES/tools.mo
+lib/R/library/translations/ar/LC_MESSAGES/utils.mo
+lib/R/library/translations/bn/LC_MESSAGES/R-base.mo
+lib/R/library/translations/bn/LC_MESSAGES/RGui.mo
+lib/R/library/translations/bn/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-base.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-compiler.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-grDevices.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-graphics.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-grid.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-splines.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-stats4.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-tcltk.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/ca/LC_MESSAGES/R-utils.mo
+lib/R/library/translations/ca/LC_MESSAGES/R.mo
+lib/R/library/translations/ca/LC_MESSAGES/RGui.mo
+lib/R/library/translations/ca/LC_MESSAGES/grDevices.mo
+lib/R/library/translations/ca/LC_MESSAGES/graphics.mo
+lib/R/library/translations/ca/LC_MESSAGES/grid.mo
+lib/R/library/translations/ca/LC_MESSAGES/methods.mo
+lib/R/library/translations/ca/LC_MESSAGES/parallel.mo
+lib/R/library/translations/ca/LC_MESSAGES/splines.mo
+lib/R/library/translations/ca/LC_MESSAGES/stats.mo
+lib/R/library/translations/ca/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/ca/LC_MESSAGES/tools.mo
+lib/R/library/translations/ca/LC_MESSAGES/utils.mo
lib/R/library/translations/da/LC_MESSAGES/R-base.mo
lib/R/library/translations/da/LC_MESSAGES/R-compiler.mo
lib/R/library/translations/da/LC_MESSAGES/R-grDevices.mo
@@ -1359,12 +1457,50 @@ lib/R/library/translations/en@quot/LC_MESSAGES/stats.mo
lib/R/library/translations/en@quot/LC_MESSAGES/tcltk.mo
lib/R/library/translations/en@quot/LC_MESSAGES/tools.mo
lib/R/library/translations/en@quot/LC_MESSAGES/utils.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-base.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-compiler.mo
lib/R/library/translations/en_GB/LC_MESSAGES/R-grDevices.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-graphics.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-grid.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-splines.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-stats4.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-tcltk.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/R-utils.mo
lib/R/library/translations/en_GB/LC_MESSAGES/R.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/RGui.mo
lib/R/library/translations/en_GB/LC_MESSAGES/grDevices.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/graphics.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/grid.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/methods.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/parallel.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/splines.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/stats.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/tools.mo
+lib/R/library/translations/en_GB/LC_MESSAGES/utils.mo
+lib/R/library/translations/es/LC_MESSAGES/R-base.mo
+lib/R/library/translations/es/LC_MESSAGES/R-grDevices.mo
+lib/R/library/translations/es/LC_MESSAGES/R-graphics.mo
+lib/R/library/translations/es/LC_MESSAGES/R-grid.mo
+lib/R/library/translations/es/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/es/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/es/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/es/LC_MESSAGES/R-stats4.mo
+lib/R/library/translations/es/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/es/LC_MESSAGES/R-utils.mo
lib/R/library/translations/es/LC_MESSAGES/R.mo
lib/R/library/translations/es/LC_MESSAGES/RGui.mo
+lib/R/library/translations/es/LC_MESSAGES/grDevices.mo
lib/R/library/translations/es/LC_MESSAGES/graphics.mo
+lib/R/library/translations/es/LC_MESSAGES/parallel.mo
+lib/R/library/translations/es/LC_MESSAGES/stats.mo
+lib/R/library/translations/es/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/es/LC_MESSAGES/tools.mo
+lib/R/library/translations/es/LC_MESSAGES/utils.mo
lib/R/library/translations/fa/LC_MESSAGES/R-base.mo
lib/R/library/translations/fa/LC_MESSAGES/R-utils.mo
lib/R/library/translations/fa/LC_MESSAGES/R.mo
@@ -1394,6 +1530,40 @@ lib/R/library/translations/fr/LC_MESSAGES/stats.mo
lib/R/library/translations/fr/LC_MESSAGES/tcltk.mo
lib/R/library/translations/fr/LC_MESSAGES/tools.mo
lib/R/library/translations/fr/LC_MESSAGES/utils.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-base.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-grDevices.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-graphics.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/hi/LC_MESSAGES/R-utils.mo
+lib/R/library/translations/hi/LC_MESSAGES/R.mo
+lib/R/library/translations/hi/LC_MESSAGES/RGui.mo
+lib/R/library/translations/hi/LC_MESSAGES/grDevices.mo
+lib/R/library/translations/hi/LC_MESSAGES/graphics.mo
+lib/R/library/translations/hi/LC_MESSAGES/parallel.mo
+lib/R/library/translations/hi/LC_MESSAGES/stats.mo
+lib/R/library/translations/hi/LC_MESSAGES/tools.mo
+lib/R/library/translations/hi/LC_MESSAGES/utils.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-base.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-graphics.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-splines.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-stats.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-tcltk.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-tools.mo
+lib/R/library/translations/hu/LC_MESSAGES/R-utils.mo
+lib/R/library/translations/hu/LC_MESSAGES/R.mo
+lib/R/library/translations/hu/LC_MESSAGES/RGui.mo
+lib/R/library/translations/hu/LC_MESSAGES/grDevices.mo
+lib/R/library/translations/hu/LC_MESSAGES/graphics.mo
+lib/R/library/translations/hu/LC_MESSAGES/grid.mo
+lib/R/library/translations/hu/LC_MESSAGES/parallel.mo
+lib/R/library/translations/hu/LC_MESSAGES/stats.mo
+lib/R/library/translations/hu/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/hu/LC_MESSAGES/tools.mo
+lib/R/library/translations/hu/LC_MESSAGES/utils.mo
+lib/R/library/translations/id/LC_MESSAGES/R-base.mo
lib/R/library/translations/it/LC_MESSAGES/R-base.mo
lib/R/library/translations/it/LC_MESSAGES/R-compiler.mo
lib/R/library/translations/it/LC_MESSAGES/R-grDevices.mo
@@ -1425,6 +1595,7 @@ lib/R/library/translations/ja/LC_MESSAGES/R-grDevices.mo
lib/R/library/translations/ja/LC_MESSAGES/R-graphics.mo
lib/R/library/translations/ja/LC_MESSAGES/R-grid.mo
lib/R/library/translations/ja/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/ja/LC_MESSAGES/R-parallel.mo
lib/R/library/translations/ja/LC_MESSAGES/R-splines.mo
lib/R/library/translations/ja/LC_MESSAGES/R-stats.mo
lib/R/library/translations/ja/LC_MESSAGES/R-stats4.mo
@@ -1437,6 +1608,7 @@ lib/R/library/translations/ja/LC_MESSAGES/grDevices.mo
lib/R/library/translations/ja/LC_MESSAGES/graphics.mo
lib/R/library/translations/ja/LC_MESSAGES/grid.mo
lib/R/library/translations/ja/LC_MESSAGES/methods.mo
+lib/R/library/translations/ja/LC_MESSAGES/parallel.mo
lib/R/library/translations/ja/LC_MESSAGES/splines.mo
lib/R/library/translations/ja/LC_MESSAGES/stats.mo
lib/R/library/translations/ja/LC_MESSAGES/tcltk.mo
@@ -1491,6 +1663,9 @@ lib/R/library/translations/lt/LC_MESSAGES/stats.mo
lib/R/library/translations/lt/LC_MESSAGES/tcltk.mo
lib/R/library/translations/lt/LC_MESSAGES/tools.mo
lib/R/library/translations/lt/LC_MESSAGES/utils.mo
+lib/R/library/translations/ne/LC_MESSAGES/R-compiler.mo
+lib/R/library/translations/ne/LC_MESSAGES/R.mo
+lib/R/library/translations/ne/LC_MESSAGES/RGui.mo
lib/R/library/translations/nn/LC_MESSAGES/R-base.mo
lib/R/library/translations/nn/LC_MESSAGES/R.mo
lib/R/library/translations/nn/LC_MESSAGES/RGui.mo
@@ -1526,6 +1701,7 @@ lib/R/library/translations/pt_BR/LC_MESSAGES/R-grDevices.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-graphics.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-grid.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-methods.mo
+lib/R/library/translations/pt_BR/LC_MESSAGES/R-parallel.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-splines.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-stats.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/R-stats4.mo
@@ -1542,6 +1718,7 @@ lib/R/library/translations/pt_BR/LC_MESSAGES/splines.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/stats.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/tcltk.mo
lib/R/library/translations/pt_BR/LC_MESSAGES/tools.mo
+lib/R/library/translations/pt_BR/LC_MESSAGES/utils.mo
lib/R/library/translations/ru/LC_MESSAGES/R-base.mo
lib/R/library/translations/ru/LC_MESSAGES/R-compiler.mo
lib/R/library/translations/ru/LC_MESSAGES/R-grDevices.mo
@@ -1567,6 +1744,8 @@ lib/R/library/translations/ru/LC_MESSAGES/stats.mo
lib/R/library/translations/ru/LC_MESSAGES/tcltk.mo
lib/R/library/translations/ru/LC_MESSAGES/tools.mo
lib/R/library/translations/ru/LC_MESSAGES/utils.mo
+lib/R/library/translations/sq/LC_MESSAGES/R-base.mo
+lib/R/library/translations/sq/LC_MESSAGES/R.mo
lib/R/library/translations/tr/LC_MESSAGES/R-base.mo
lib/R/library/translations/tr/LC_MESSAGES/R-stats.mo
lib/R/library/translations/tr/LC_MESSAGES/R-stats4.mo
@@ -1575,6 +1754,7 @@ lib/R/library/translations/tr/LC_MESSAGES/R-utils.mo
lib/R/library/translations/tr/LC_MESSAGES/R.mo
lib/R/library/translations/tr/LC_MESSAGES/RGui.mo
lib/R/library/translations/tr/LC_MESSAGES/graphics.mo
+lib/R/library/translations/ur/LC_MESSAGES/R-base.mo
lib/R/library/translations/zh_CN/LC_MESSAGES/R-base.mo
lib/R/library/translations/zh_CN/LC_MESSAGES/R-compiler.mo
lib/R/library/translations/zh_CN/LC_MESSAGES/R-grDevices.mo
@@ -1652,8 +1832,8 @@ lib/R/library/utils/iconvlist
lib/R/library/utils/libs/utils.so
lib/R/library/utils/misc/exDIF.csv
lib/R/library/utils/misc/exDIF.dif
-lib/R/modules/R_X11.so
-lib/R/modules/R_de.so
+${PLIST.x11}lib/R/modules/R_X11.so
+${PLIST.x11}lib/R/modules/R_de.so
lib/R/modules/internet.so
lib/R/modules/lapack.so
lib/R/share/R/REMOVE.R
@@ -1662,6 +1842,9 @@ lib/R/share/R/examples-header.R
lib/R/share/R/nspackloader.R
lib/R/share/R/tests-startup.R
lib/R/share/Rd/macros/system.Rd
+lib/R/share/dictionaries/R_Rd_files.rds
+lib/R/share/dictionaries/R_manuals.rds
+lib/R/share/dictionaries/R_vignettes.rds
lib/R/share/dictionaries/en_stats.rds
lib/R/share/encodings/Adobe-glyphlist
lib/R/share/encodings/character-sets
diff --git a/R/distinfo b/R/distinfo
index 8d0de8b44a..4f0164c270 100644
--- a/R/distinfo
+++ b/R/distinfo
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.103 2024/02/15 07:48:50 markd Exp $
-BLAKE2s (R-4.3.3.tar.gz) = 59e9ead4142a600fdb24f91f957aa89dee798284410d4b6fa17c77cb1eacacd4
-SHA512 (R-4.3.3.tar.gz) = 26291590d935ea5678771cdcaea013a6c030897eb762b0204e42b34b0f1d33aac1ec933f36caa18d2a31a057a4456bf629222e4f5679f24bc48a7a764b1aedbe
-Size (R-4.3.3.tar.gz) = 35861202 bytes
-SHA1 (patch-configure.ac) = 3cd063c424b7b9674f434d49c771b76dde73ac5c
-SHA1 (patch-m4_R.m4) = 48a1d38b5505cbb87bd2c156f262680156c07a02
+BLAKE2s (R-4.4.0.tar.gz) = 31efebb6f183d6e754b82dfb14b4715659a01d5ee95b86048d6127f884d42d6a
+SHA512 (R-4.4.0.tar.gz) = 8f44eac49c58db7f161732135be4d1757f65b18545f3f15c463d499794735d02f4a4cb9bacff90d16e80b624ead8aa0af16899cf7654b6cb91a46868e405bd17
+Size (R-4.4.0.tar.gz) = 37335563 bytes
+SHA1 (patch-configure.ac) = 91bed37afc2ee2f68695f8496c56ae23aaf42b43
+SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf
SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
SHA1 (patch-src_main_character.c) = c1be2cae404ecbdd547343b70e9d072e9e1d5549
diff --git a/R/patches/patch-configure.ac b/R/patches/patch-configure.ac
index c4b94ee299..0c017d530e 100644
--- a/R/patches/patch-configure.ac
+++ b/R/patches/patch-configure.ac
@@ -3,8 +3,8 @@ $NetBSD: patch-configure.ac,v 1.8 2024/01/08 23:13:03 mef Exp $
Do not include system paths in R_LD_LIBRARY_PATH.
NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
---- configure.ac.orig 2019-06-08 08:57:35.738653089 +0000
-+++ configure.ac
+--- configure.ac.orig 2024-03-27 08:02:03.000000000 +0900
++++ configure.ac 2024-04-29 00:00:51.788804133 +0900
@@ -33,6 +33,7 @@ m4_define([R_VERSION],
AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
AC_CONFIG_SRCDIR([src/include/Defn.h])
@@ -13,16 +13,25 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
### * Information on the package.
-@@ -290,7 +291,7 @@ AC_ARG_ENABLE([BLAS-shlib],
+@@ -136,7 +137,7 @@ R_CONFIG_ARGS="${ac_configure_args}"
+ AC_SUBST(R_CONFIG_ARGS)
+
+ ## Shortcut for musl which refuses to identify itself at C level
+-if test "${host_os}" == "linux-musl"; then
++if test "${host_os}" = "linux-musl"; then
+ AC_DEFINE(OS_MUSL, 1, [Define if running on Linux-musl])
+ fi
+
+@@ -316,7 +317,7 @@ AC_ARG_ENABLE([BLAS-shlib],
## As from R 3.2.0 split up -L... and -lR
if test "${want_R_shlib}" = yes; then
- LIBR0="-L\"\$(R_HOME)/lib\$(R_ARCH)\""
-+ LIBR0="@COMPILER_RPATH_FLAG@${prefix}/lib/R/lib\$(R_ARCH) -L\"\$(R_HOME)/lib\$(R_ARCH)\""
++ LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\"\$(R_HOME)/lib\$(R_ARCH)\""
LIBR1=-lR
else
LIBR0=
-@@ -709,7 +710,7 @@ case "${host_os}" in
+@@ -898,7 +899,7 @@ case "${host_os}" in
## Not so bad in later versions of Darwin,
## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
;;
@@ -31,7 +40,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
for arg in ${LDFLAGS}; do
case "${arg}" in
-L*)
-@@ -1276,7 +1277,7 @@ rm -f libconftest${DYLIB_EXT} conftest.c
+@@ -1549,7 +1550,7 @@ rm -f libconftest${DYLIB_EXT} conftest.c
fpicflags="${darwin_pic}"
shlib_cxxldflags="${shlib_ldflags}"
;;
@@ -40,7 +49,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
## maybe this needs to depend on the compiler:
## -export-dynamic used to work, but does not with clang.
## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
-@@ -1365,6 +1366,12 @@ dnl ;;
+@@ -1638,6 +1639,12 @@ dnl ;;
;;
netbsd*)
## See the comments about FreeBSD
@@ -53,7 +62,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
main_ldflags="-Wl,--export-dynamic"
shlib_ldflags="-shared"
-@@ -1401,22 +1408,22 @@ dnl ;;
+@@ -1674,22 +1681,22 @@ dnl ;;
solaris*)
## SPARC has only an 8k global object table, 1024 entries on 64-bit,
## so need PIC not pic. They are the same on other Solaris platforms.
@@ -80,7 +89,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
cpicflags="-KPIC"
if test "`basename ${CXX}`" = "CC" ; then
## Forte version 7 needs -lCstd: Forte 6 does not.
-@@ -1495,7 +1502,7 @@ fi
+@@ -1768,7 +1775,7 @@ fi
: ${CXXPICFLAGS="${cxxpicflags}"}
if test -n "${CXX}" -a -z "${CXXPICFLAGS}"; then
case "${host_os}" in
@@ -89,7 +98,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
;;
*)
warn_cxxpicflags="I could not determine CXXPICFLAGS."
-@@ -1555,8 +1562,10 @@ dnl ;;
+@@ -1828,8 +1835,10 @@ dnl ;;
MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[[\.]][[1-9]]$/.0/"`
LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
@@ -101,7 +110,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
;;
dnl hpux*)
dnl ## Needs to avoid embedding a relative path ../../../bin.
-@@ -2482,7 +2491,7 @@ case "${host_os}" in
+@@ -2825,7 +2834,7 @@ case "${host_os}" in
r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib"
;;
solaris*)
@@ -110,3 +119,15 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
;;
*)
r_ld_library_defaults=
+@@ -2995,9 +3004,9 @@ sdk_OK=no)
+ dnl No longer used as we only build (or not) BLAS and LAPACK shims
+ dnl AC_DEFINE(USE_NEW_ACCELERATE, 1, [Define to use Apple's (new) Accelerate])
+ fi
+-AM_CONDITIONAL(BUILD_NEW_ACCELERATE, [test "x${use_accelerate}" == xyes])
++AM_CONDITIONAL(BUILD_NEW_ACCELERATE, [test "x${use_accelerate}" = xyes])
+ AM_CONDITIONAL(BUILD_NEW_ACCELERATE_LAPACK,
+- [test "x${use_accelerate_lapack}" == xyes])
++ [test "x${use_accelerate_lapack}" = xyes])
+
+ dnl record compiler versions
+ CC_VER=`${CC} --version | ${SED} -n 1p`
diff --git a/R/patches/patch-m4_R.m4 b/R/patches/patch-m4_R.m4
index c209a5e1d8..2daf7f1126 100644
--- a/R/patches/patch-m4_R.m4
+++ b/R/patches/patch-m4_R.m4
@@ -2,38 +2,35 @@ $NetBSD: patch-m4_R.m4,v 1.5 2024/01/08 23:15:39 mef Exp $
Ensure tests for clog & co. fail, not just emit warning
---- m4/R.m4.orig 2023-07-30 07:15:01.000000000 +0900
-+++ m4/R.m4 2024-01-09 08:02:14.228733733 +0900
-@@ -226,7 +226,7 @@ if test -z "${texi2any_version_maj}" \
- elif test ${texi2any_version_maj} -gt 5; then
- r_cv_prog_texi2any_v5=yes
- elif test ${texi2any_version_maj} -lt 5 \
-- || test ${texi2any_version_min} -lt 1; then
-+ || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then
- r_cv_prog_texi2any_v5=no
- else
- r_cv_prog_texi2any_v5=yes
-@@ -905,6 +905,9 @@ dnl Yes we need to double quote this ...
+--- m4/R.m4.orig 2024-04-05 07:15:01.000000000 +0900
++++ m4/R.m4 2024-04-28 23:55:22.817246115 +0900
+@@ -1,4 +1,4 @@
+-### R.m4 -- extra macros for configuring R -*- Autoconf -*-
++:### R.m4 -- extra macros for configuring R -*- Autoconf -*-
+ ###
+ ### Copyright (C) 1998-2024 R Core Team
+ ###
+@@ -927,6 +927,9 @@ dnl Yes we need to double quote this ...
extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
+int MAIN_ () { return 0; }
+int MAIN__ () { return 0; }
+
- int main () {
+ int main (void) {
int a[3] = {17, 237, 2000000000}, b[2], res = 0;
double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -1000,6 +1003,9 @@ typedef union {
+@@ -1022,6 +1025,9 @@ typedef union {
extern void F77_SYMBOL(cftest)(Rcomplex *x);
+int MAIN_ () { return 0; }
+int MAIN__ () { return 0; }
+
- int main () {
+ int main (void) {
Rcomplex z[3];
-@@ -3858,9 +3864,9 @@ R_CHECK_FUNCS([cabs carg cexp clog csqrt
+@@ -4081,9 +4087,9 @@ R_CHECK_FUNCS([cabs carg cexp clog csqrt
AC_DEFUN([R_CHECK_DECL],
[AS_VAR_PUSHDEF([ac_Symbol], [ac_cv_have_decl_$1])dnl
AC_CACHE_CHECK([whether $1 exists and is declared], ac_Symbol,
@@ -46,7 +43,7 @@ Ensure tests for clog & co. fail, not just emit warning
#endif
])],
[AS_VAR_SET(ac_Symbol, yes)],
-@@ -4682,9 +4688,9 @@ AC_CACHE_CHECK([if libcurl is >= 7.28.0]
+@@ -4905,9 +4911,9 @@ AC_CACHE_CHECK([if libcurl is >= 7.28.0]
int main(void)
{
#ifdef LIBCURL_VERSION_MAJOR
Home |
Main Index |
Thread Index |
Old Index