Commit 40b6d464 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.9.1-1

r-base (2.9.1-1) unstable; urgency=low

  * New upstream version released this morning

  * configure,m4/R.m4: Add xdg-open to set of pdf viewers checked by configure
    (and this change has been committed upstream for 2.10.0 as well).

  * As of this morning, the Debian Java toolchain is broken (#534520) so 
    support for Java is disabled by temporarily removing 
      openjdk-6-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
    from Build-Depends: --- a new upload will be provided once this problem
    is fixed.

r-base (2.9.1~20090621-1) unstable; urgency=low

  * First beta release of R 2.9.1 which should be released on June 26

  * configure,m4/R.m4: Add xdg-open to set of pdf viewers checked by configure

r-base (2.9.1~20090618-1) unstable; urgency=low

  * First beta release of R 2.9.1 which should be released on June 26

  * debian/control: Switched (Build-)Depends: from xpdf-reader to xdg-utils; 
    pdf files will now be opened with xdg-open to reflect desktop choices.
  
  * debian/README.Atlas: Further editing, added test script

  * debian/r-cran.mk: Do not remove src/Makevars.in in clean step as this was 
    seen to upset some packages when used by cran2deb for all of CRAN
parents 14580881 de09547b
This diff is collapsed.
Revision: 48333 Revision: 48839
Last Changed Date: 2009-04-17 Last Changed Date: 2009-06-26
...@@ -192,9 +192,9 @@ ...@@ -192,9 +192,9 @@
## FC= ## FC=
## FCFLAGS= ## FCFLAGS=
## FCPICFLAGS= ## FCPICFLAGS=
## SHLIB_FCLD=$(FC) ## SHLIB_FCLD=${FC}
## Unlike SHLIB_CXXLDFLAGS, SHLIB_FCLDFLAGS is never additional ## Unlike SHLIB_CXXLDFLAGS, SHLIB_FCLDFLAGS is never additional
## SHLIB_FCLDFLAGS=$(SHLIB_LDFLAGS) ## SHLIB_FCLDFLAGS=${SHLIB_LDFLAGS}
## Tcl/Tk settings. ## Tcl/Tk settings.
## Use TCLTK_LIBS for all '-L' and '-l' options needed for linking ## Use TCLTK_LIBS for all '-L' and '-l' options needed for linking
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for R 2.9.0. # Generated by GNU Autoconf 2.61 for R 2.9.1.
# #
# Report bugs to <r-bugs@R-project.org>. # Report bugs to <r-bugs@R-project.org>.
# #
...@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} ...@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='R' PACKAGE_NAME='R'
PACKAGE_TARNAME='R' PACKAGE_TARNAME='R'
PACKAGE_VERSION='2.9.0' PACKAGE_VERSION='2.9.1'
PACKAGE_STRING='R 2.9.0' PACKAGE_STRING='R 2.9.1'
PACKAGE_BUGREPORT='r-bugs@R-project.org' PACKAGE_BUGREPORT='r-bugs@R-project.org'
ac_unique_file="src/include/Defn.h" ac_unique_file="src/include/Defn.h"
...@@ -1657,7 +1657,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1657,7 +1657,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures R 2.9.0 to adapt to many kinds of systems. \`configure' configures R 2.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1732,7 +1732,7 @@ fi ...@@ -1732,7 +1732,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of R 2.9.0:";; short | recursive ) echo "Configuration of R 2.9.1:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1947,7 +1947,7 @@ fi ...@@ -1947,7 +1947,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
R configure 2.9.0 R configure 2.9.1
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
...@@ -1961,7 +1961,7 @@ cat >config.log <<_ACEOF ...@@ -1961,7 +1961,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by R $as_me 2.9.0, which was It was created by R $as_me 2.9.1, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -4445,7 +4445,7 @@ fi ...@@ -4445,7 +4445,7 @@ fi
## PDF viewer ## PDF viewer
for ac_prog in ${R_PDFVIEWER} acroread acroread4 evince xpdf gv gnome-gv ggv kghostview open gpdf for ac_prog in ${R_PDFVIEWER} acroread acroread4 xdg-open evince xpdf gv gnome-gv ggv kghostview open gpdf
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -59176,7 +59176,7 @@ exec 6>&1 ...@@ -59176,7 +59176,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by R $as_me 2.9.0, which was This file was extended by R $as_me 2.9.1, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -59229,7 +59229,7 @@ Report bugs to <bug-autoconf@gnu.org>." ...@@ -59229,7 +59229,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
R config.status 2.9.0 R config.status 2.9.1
configured by $0, generated by GNU Autoconf 2.61, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Notes on using Atlas libs with GNU Octave and GNU R Notes on using Atlas libs with GNU Octave and GNU R
I. Overview I. Overview
===========
As of the Debian releases 2.1.34-6 (for GNU Octave) and 1.3.0-3 (for GNU R), As of the Debian releases 2.1.34-6 (for GNU Octave) and 1.3.0-3 (for GNU R),
both Octave and R can be used with Atlas, the Automatically Tuned Linear both Octave and R can be used with Atlas, the Automatically Tuned Linear
...@@ -27,8 +28,10 @@ your specific machine to further optimise performance. ...@@ -27,8 +28,10 @@ your specific machine to further optimise performance.
II. Using the Atlas libraries II. Using the Atlas libraries
=============================
II.A New default behaviour with automatic loading of the Atlas libraries II.A New default behaviour with automatic loading of the Atlas libraries
------------------------------------------------------------------------
Users have to make no changes whatsoever as the Atlas library will be loaded Users have to make no changes whatsoever as the Atlas library will be loaded
instead of the standard blas and lapack libraries. instead of the standard blas and lapack libraries.
...@@ -36,6 +39,7 @@ instead of the standard blas and lapack libraries. ...@@ -36,6 +39,7 @@ instead of the standard blas and lapack libraries.
An example such as the script below can be useful to test the performance. An example such as the script below can be useful to test the performance.
II.B Old behaviour requiring LD_LIBRARY_PATH for Octave II.B Old behaviour requiring LD_LIBRARY_PATH for Octave
-------------------------------------------------------
[ NB: This section has long been obsolete is kept for the historical record [ NB: This section has long been obsolete is kept for the historical record
only. ] only. ]
...@@ -84,6 +88,7 @@ intensive load is expected. This is described in the next section. ...@@ -84,6 +88,7 @@ intensive load is expected. This is described in the next section.
III. Locally compiling the Atlas libraries III. Locally compiling the Atlas libraries
==========================================
The Debian Atlas packages have been setup to allow for local recompilation of The Debian Atlas packages have been setup to allow for local recompilation of
the Atlas libraries. This way the behaviour will be tuned exactly to the the Atlas libraries. This way the behaviour will be tuned exactly to the
...@@ -100,6 +105,7 @@ the process is essentially the following [ courtesy of Doug Bates ] ...@@ -100,6 +105,7 @@ the process is essentially the following [ courtesy of Doug Bates ]
IV. See also IV. See also
=============
The Atlas packages have a very detailed README.Debian file which should be The Atlas packages have a very detailed README.Debian file which should be
consulted; it also details local recompilation. Sources and documentation for consulted; it also details local recompilation. Sources and documentation for
...@@ -107,6 +113,7 @@ Atlas are at http://www.netlib.org/atlas. ...@@ -107,6 +113,7 @@ Atlas are at http://www.netlib.org/atlas.
V. Acknowledgements V. Acknowledgements
====================
Camm Maguire developed the scheme of overloading Atlas over the default blas Camm Maguire developed the scheme of overloading Atlas over the default blas
libraries and deserves all the credit. Many thanks to John Eaton for helping libraries and deserves all the credit. Many thanks to John Eaton for helping
...@@ -115,6 +122,60 @@ package. Special thanks to Ben Collins for providing a patched ldconfig as ...@@ -115,6 +122,60 @@ package. Special thanks to Ben Collins for providing a patched ldconfig as
part of the libc6 package. part of the libc6 package.
VI. Appendix
============
A simple test script such as the following
-----------------------------------------------------------------------------
#!/bin/sh
# remove Atlas et al
sudo dpkg --purge libatlas3gf-base > /dev/null
dpkg -l | grep "blas\|lapack\|atlas"
: ${SIZE=1500}
: ${REPS=20}
r_cmd="m<-matrix(rnorm(${SIZE}*${SIZE}),ncol=${SIZE}); cat(mean(replicate($REPS,system.time(crossprod(m))[1]),trim=0.1),'\n')"
echo ""
echo "GNU R: $r_cmd"
echo -n " Without Atlas: "
echo -n "$r_cmd" | R --vanilla --slave
sudo apt-get install libatlas3gf-base > /dev/null
echo -n " With Atlas base : "
echo -n "$r_cmd" | R --vanilla --slave
sudo dpkg --purge libatlas3gf-base > /dev/null
sudo apt-get install libatlas3gf-sse > /dev/null
echo -n " With Atlas sse : "
echo -n "$r_cmd" | R --vanilla --slave
sudo dpkg --purge libatlas3gf-sse > /dev/null
sudo apt-get install libatlas3gf-sse2 > /dev/null
echo -n " With Atlas sse2 : "
echo -n "$r_cmd" | R --vanilla --slave
sudo dpkg --purge libatlas3gf-sse2 > /dev/null
-----------------------------------------------------------------------------
can be used to test the setup. On a dual Xeon running Debian testing (x86, ie
32bit) in May 2009, I see the following output:
GNU R: m<-matrix(rnorm(1500*1500),ncol=1500); cat(mean(replicate(20,system.time(crossprod(m))[1]),trim=0.1),'\n')
Without Atlas: 4.146438
With Atlas base : 1.788125
With Atlas sse : 1.573625
With Atlas sse2 : 0.8465625
indicating about a three-fold increase in speed for the 'base' version and
even a five-fold increase for the sse2 version.
VI. Revision History
====================
Initial version Initial version
-- Dirk Eddelbuettel <edd@debian.org> Tue, 21 Aug 2001 21:37:15 -0500 -- Dirk Eddelbuettel <edd@debian.org> Tue, 21 Aug 2001 21:37:15 -0500
......
r-base (2.9.1-1) unstable; urgency=low
* New upstream version released this morning
* configure,m4/R.m4: Add xdg-open to set of pdf viewers checked by configure
(and this change has been committed upstream for 2.10.0 as well).
* As of this morning, the Debian Java toolchain is broken (#534520) so
support for Java is disabled by temporarily removing
openjdk-6-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
from Build-Depends: --- a new upload will be provided once this problem
is fixed.
-- Dirk Eddelbuettel <edd@debian.org> Fri, 26 Jun 2009 09:34:58 -0500
r-base (2.9.1~20090621-1) unstable; urgency=low
* First beta release of R 2.9.1 which should be released on June 26
* configure,m4/R.m4: Add xdg-open to set of pdf viewers checked by configure
-- Dirk Eddelbuettel <edd@debian.org> Sun, 21 Jun 2009 21:21:25 -0500
r-base (2.9.1~20090618-1) unstable; urgency=low
* First beta release of R 2.9.1 which should be released on June 26
* debian/control: Switched (Build-)Depends: from xpdf-reader to xdg-utils;
pdf files will now be opened with xdg-open to reflect desktop choices.
* debian/README.Atlas: Further editing, added test script
* debian/r-cran.mk: Do not remove src/Makevars.in in clean step as this was
seen to upset some packages when used by cran2deb for all of CRAN
-- Dirk Eddelbuettel <edd@debian.org> Thu, 18 Jun 2009 07:00:11 -0500
r-base (2.9.0-4) unstable; urgency=low r-base (2.9.0-4) unstable; urgency=low
* debian/r-cran.mk: Applied suggestion by Julian Gilbey to correct * debian/r-cran.mk: Applied suggestion by Julian Gilbey to correct
accidental lowercasing of CRAN package names which can prevent removal accidental lowercasing of CRAN package names which can prevent removal
extra license files (Closes: #531224) ot extra license files (Closes: #531224)
* debian/README.Atlas: Updated to current packages (Closes: #531223) * debian/README.Atlas: Updated to current packages (Closes: #531223)
......
...@@ -3,7 +3,7 @@ Section: gnu-r ...@@ -3,7 +3,7 @@ Section: gnu-r
Priority: optional Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org> Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.8.1 Standards-Version: 3.8.1
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 7.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html, openjdk-6-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 7.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xdg-utils, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html
Homepage: http://www.r-project.org/ Homepage: http://www.r-project.org/
Package: r-base Package: r-base
...@@ -225,7 +225,7 @@ Description: GNU R LaTeX docs for statistical computing system functions ...@@ -225,7 +225,7 @@ Description: GNU R LaTeX docs for statistical computing system functions
Package: r-doc-pdf Package: r-doc-pdf
Architecture: all Architecture: all
Section: doc Section: doc
Suggests: r-base-core, xpdf-reader | pdf-viewer Suggests: r-base-core, xdg-utils | pdf-viewer
Description: GNU R pdf manuals for statistical computing system Description: GNU R pdf manuals for statistical computing system
R is a system for statistical computation and graphics. It consists R is a system for statistical computation and graphics. It consists
of a language plus a run-time environment with graphics, a debugger, of a language plus a run-time environment with graphics, a debugger,
......
...@@ -97,7 +97,7 @@ clean:: ...@@ -97,7 +97,7 @@ clean::
# rm -f configure \ # rm -f configure \
#fi #fi
## ##
if [ -r src/Makevars.in ]; then \ # if [ -r src/Makevars.in ]; then \
rm -f src/Makevars; \ # rm -f src/Makevars; \
fi # fi
This diff is collapsed.
...@@ -225,7 +225,7 @@ span.env{font-family: monospace} ...@@ -225,7 +225,7 @@ span.env{font-family: monospace}
<p>This is a guide to installation and administration for R. <p>This is a guide to installation and administration for R.
<p>The current version of this document is 2.9.0 (2009-04-17). <p>The current version of this document is 2.9.1 (2009-06-26).
<p>ISBN 3-900051-09-7 <p>ISBN 3-900051-09-7
...@@ -267,7 +267,7 @@ setting of <code>umask</code> whilst building and installing.) ...@@ -267,7 +267,7 @@ setting of <code>umask</code> whilst building and installing.)
<h3 class="section">1.2 Getting patched and development versions</h3> <h3 class="section">1.2 Getting patched and development versions</h3>
<p>A patched version of the current release, &lsquo;<samp><span class="samp">r-patched</span></samp>&rsquo; and the <p>A patched version of the current release, &lsquo;<samp><span class="samp">r-patched</span></samp>&rsquo;, and the
current development version, &lsquo;<samp><span class="samp">r-devel</span></samp>&rsquo;, are available as daily current development version, &lsquo;<samp><span class="samp">r-devel</span></samp>&rsquo;, are available as daily
tarballs and via access to the R Subversion repository. (For the two tarballs and via access to the R Subversion repository. (For the two
weeks prior to the release of a minor (2.x.0) version, &lsquo;<samp><span class="samp">r-patched</span></samp>&rsquo; weeks prior to the release of a minor (2.x.0) version, &lsquo;<samp><span class="samp">r-patched</span></samp>&rsquo;
...@@ -618,7 +618,7 @@ specified on the <samp><span class="command">make install</span></samp> command ...@@ -618,7 +618,7 @@ specified on the <samp><span class="command">make install</span></samp> command
<code>libdir</code>. The C header files can be installed to the value of <code>libdir</code>. The C header files can be installed to the value of
<code>rincludedir</code>: note that as the headers are not installed into a <code>rincludedir</code>: note that as the headers are not installed into a
subdirectory you probably want something like subdirectory you probably want something like
<code>rincludedir=/usr/local/include/R-2.9.0</code>. <code>rincludedir=/usr/local/include/R-2.9.1</code>.
<p>If you want the R home to be something other than <p>If you want the R home to be something other than
<samp><var>libdir</var><span class="file">/R</span></samp>, use <samp><span class="option">rhome</span></samp>: for example <samp><var>libdir</var><span class="file">/R</span></samp>, use <samp><span class="option">rhome</span></samp>: for example
...@@ -848,7 +848,7 @@ from <acronym>CRAN</acronym> to run on Windows 2000 or later on ix86 CPUs ...@@ -848,7 +848,7 @@ from <acronym>CRAN</acronym> to run on Windows 2000 or later on ix86 CPUs
<p>Your file system must allow long file names (as is likely except <p>Your file system must allow long file names (as is likely except
perhaps for some network-mounted systems). perhaps for some network-mounted systems).
<p>Installation is <em>via</em> the installer <samp><span class="file">R-2.9.0-win32.exe</span></samp>. <p>Installation is <em>via</em> the installer <samp><span class="file">R-2.9.1-win32.exe</span></samp>.
Just double-click on the icon and follow the instructions. You can Just double-click on the icon and follow the instructions. You can
uninstall R from the Control Panel. (Note that you will probably uninstall R from the Control Panel. (Note that you will probably
(depending on the Windows language settings) be asked to choose a (depending on the Windows language settings) be asked to choose a
...@@ -885,11 +885,11 @@ will call this directory <var>R_HOME</var> below. ...@@ -885,11 +885,11 @@ will call this directory <var>R_HOME</var> below.
<p>You need to collect the following sets of files: <p>You need to collect the following sets of files:
<ul> <ul>
<li>Get the R source code <samp><span class="file">R-2.9.0.tar.gz</span></samp> from <li>Get the R source code <samp><span class="file">R-2.9.1.tar.gz</span></samp> from
<acronym>CRAN</acronym>. Open a command window (or another shell) at <acronym>CRAN</acronym>. Open a command window (or another shell) at
directory <var>R_HOME</var>, and run directory <var>R_HOME</var>, and run
<pre class="example"> tar zxvf R-2.9.0.tar.gz <pre class="example"> tar zxvf R-2.9.1.tar.gz
</pre> </pre>
<p class="noindent">to create the source tree in <var>R_HOME</var>. <strong>Beware</strong>: do use <p class="noindent">to create the source tree in <var>R_HOME</var>. <strong>Beware</strong>: do use
<samp><span class="command">tar</span></samp> to extract the sources rather than tools such as WinZip <samp><span class="command">tar</span></samp> to extract the sources rather than tools such as WinZip
...@@ -1122,9 +1122,16 @@ customizations to that installation. Then in ...@@ -1122,9 +1122,16 @@ customizations to that installation. Then in
<pre class="example"> make myR IMAGEDIR=rootdir <pre class="example"> make myR IMAGEDIR=rootdir
</pre> </pre>
<p class="noindent">where <samp><span class="file">rootdir</span></samp> is the path to the root of the customized <p class="noindent">where <samp><span class="file">rootdir</span></samp> is the path to the root of the customized
installation (forward slashes and no spaces, please). This creates an installation (forward slashes and no spaces, please).
executable with the standard name, <samp><span class="file">R-2.9.0-win32.exe</span></samp>, so
please rename it to indicate that it is customized. <p>Both methods create an executable with the standard name,
<samp><span class="file">R-2.9.1-win32.exe</span></samp>, so please rename it to indicate that
it is customized. If you intend to <em>distribute</em> a customized
installer please do check that license requirements are met &ndash; note that
the installer will (unless modified) state that the contents are
distributed under GPL-2 and this has a requirement for supplying the
sources (including the R sources even if you started with a binary
distribution of R).
<p>The defaults for the startup parameters may also be customized. For example <p>The defaults for the startup parameters may also be customized. For example
...@@ -1209,7 +1216,7 @@ binaries for Mac OS X for a base distribution and a large number of ...@@ -1209,7 +1216,7 @@ binaries for Mac OS X for a base distribution and a large number of
add-on packages from <acronym>CRAN</acronym> to run on Mac OS X version 10.4.4 or add-on packages from <acronym>CRAN</acronym> to run on Mac OS X version 10.4.4 or
higher. higher.
<p>The simplest way is to use <samp><span class="file">R-2.9.0.dmg</span></samp>. Just <p>The simplest way is to use <samp><span class="file">R-2.9.1.dmg</span></samp>. Just
double-click on the icon and the disk image file will be mounted. Read double-click on the icon and the disk image file will be mounted. Read
the <samp><span class="file">ReadMe.txt</span></samp> inside the disk image and follow the instructions. the <samp><span class="file">ReadMe.txt</span></samp> inside the disk image and follow the instructions.
...@@ -1224,8 +1231,8 @@ mentioned <a href="http://CRAN.R-project.org/bin/macosx/RMacOSX-FAQ.html">R for ...@@ -1224,8 +1231,8 @@ mentioned <a href="http://CRAN.R-project.org/bin/macosx/RMacOSX-FAQ.html">R for
and install some tools as explained in the document. Then you have to and install some tools as explained in the document. Then you have to
expand the R sources and configure R appropriately, for example expand the R sources and configure R appropriately, for example
<pre class="example"> tar zxvf R-2.9.0.tar.gz <pre class="example"> tar zxvf R-2.9.1.tar.gz
cd R-2.9.0 cd R-2.9.1
./configure --with-blas='-framework vecLib' --with-lapack --with-ICU \ ./configure --with-blas='-framework vecLib' --with-lapack --with-ICU \
--with-aqua --enable-R-framework --with-aqua --enable-R-framework
make make
...@@ -2124,7 +2131,8 @@ suitable code can be compiled. These tests will fail if ...@@ -2124,7 +2131,8 @@ suitable code can be compiled. These tests will fail if
<code>Gtk+</code> 2.8 or later installed will have suitable libraries, but <code>Gtk+</code> 2.8 or later installed will have suitable libraries, but
some (e.g. Solaris 10) may need <code>cairo</code> added separately. Mac OS some (e.g. Solaris 10) may need <code>cairo</code> added separately. Mac OS
X comes with none of these libraries, but <code>cairo</code> support has been X comes with none of these libraries, but <code>cairo</code> support has been
added to the binary distribution. added to the binary distribution: <code>pkg-config</code> is still needed and
can be compiled from the sources.
<p>For the best font experience with these devices you need suitable fonts <p>For the best font experience with these devices you need suitable fonts
installed: Linux users will want the <code>urw-fonts</code> package. Another installed: Linux users will want the <code>urw-fonts</code> package. Another
...@@ -3053,9 +3061,10 @@ libraries in <samp><span class="file">/usr/local/lib64</span></samp>. To build ...@@ -3053,9 +3061,10 @@ libraries in <samp><span class="file">/usr/local/lib64</span></samp>. To build
on &lsquo;<samp><span class="samp">x86_64</span></samp>&rsquo; with Fedora 8 we used on &lsquo;<samp><span class="samp">x86_64</span></samp>&rsquo; with Fedora 8 we used
<pre class="example"> CC="gcc -m32" <pre class="example"> CC="gcc -m32"
CXXFLAGS="-m32 -O2 -g" CXX="g++ -m32"
FFLAGS="-m32 -O2 -g" F77="gfortran -m32"
FCFLAGS="-m32 -O2 -g" FC=${F77}
OBJC=${CC}
LDFLAGS="-L/usr/local/lib" LDFLAGS="-L/usr/local/lib"