pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/R Update R to 2.0.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/525d15e1b982
branches:  trunk
changeset: 483743:525d15e1b982
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Nov 18 12:31:29 2004 +0000

description:
Update R to 2.0.1

Changes 2.0.1:
This is a maintenance version mainly to fix a number of minor bugs and
issues. Some rather nasty bugs were Windows-specific.

Changes 2.0.0:
Many things have changed since 1.0. The R language has acquired namespaces,
exception handling constructs, formal methods and classes, much improved
garbage collection, generalized I/O via connection objects, and
considerable improvements in the graphics area. The user workspace has been
reorganized, and so has the set of packages that ship with R. Several
"recommended packages" deemed indispensable in a statistical system are
bundled. In addition, there has been a large number of more specific new
functions, tweaks, and bugfixes.

diffstat:

 math/R/Makefile         |  10 ++++------
 math/R/distinfo         |  11 +++++------
 math/R/patches/patch-aa |  14 +++++++-------
 math/R/patches/patch-ab |  32 --------------------------------
 math/R/patches/patch-ac |  34 ++++++++++++++++++----------------
 5 files changed, 34 insertions(+), 67 deletions(-)

diffs (242 lines):

diff -r 2733e99aec7c -r 525d15e1b982 math/R/Makefile
--- a/math/R/Makefile   Thu Nov 18 12:30:49 2004 +0000
+++ b/math/R/Makefile   Thu Nov 18 12:31:29 2004 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2004/11/18 12:31:29 markd Exp $
 
-DISTNAME=              R-1.9.1
-PKGREVISION=   1
+DISTNAME=              R-2.0.1
 CATEGORIES=            math
-MASTER_SITES=          ${MASTER_SITE_R_CRAN:=base/}
-EXTRACT_SUFX=          .tgz
+MASTER_SITES=          ${MASTER_SITE_R_CRAN:=base/R-2/}
 
 MAINTAINER=            markd%NetBSD.org@localhost
 HOMEPAGE=              http://www.R-project.org/
@@ -23,7 +21,7 @@
 USE_GNU_TOOLS+=                make
 USE_GNU_READLINE=      # uses callback interface
 USE_MAKEINFO=          # defined
-TEXINFO_REQD=          4.0
+TEXINFO_REQD=          4.5
 
 GNU_CONFIGURE=         # defined
 CONFIGURE_ARGS+=       --enable-R-shlib
diff -r 2733e99aec7c -r 525d15e1b982 math/R/distinfo
--- a/math/R/distinfo   Thu Nov 18 12:30:49 2004 +0000
+++ b/math/R/distinfo   Thu Nov 18 12:31:29 2004 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.19 2004/06/24 11:09:06 markd Exp $
+$NetBSD: distinfo,v 1.20 2004/11/18 12:31:29 markd Exp $
 
-SHA1 (R-1.9.1.tgz) = 3423a1810a6a8d838554e49d54d44b05f5647085
-Size (R-1.9.1.tgz) = 9591217 bytes
-SHA1 (patch-aa) = f435eae9f0a348f5f2e105045015039abf8ac102
-SHA1 (patch-ab) = 192044af2d9cd73f19e8324384cab91635e27067
-SHA1 (patch-ac) = 42329fa99c63c3823151f7a18e0ec5b6f2f5d6dd
+SHA1 (R-2.0.1.tar.gz) = 6440c0506b170edcea6bebba5faebc3ee682dcf2
+Size (R-2.0.1.tar.gz) = 10645703 bytes
+SHA1 (patch-aa) = fa1aba5fa71e8ec219ab6cd0f61ad0c22e6e4f10
+SHA1 (patch-ac) = 84a7ab545e5f462d3c62745cc110ffcbc293ca49
 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff -r 2733e99aec7c -r 525d15e1b982 math/R/patches/patch-aa
--- a/math/R/patches/patch-aa   Thu Nov 18 12:30:49 2004 +0000
+++ b/math/R/patches/patch-aa   Thu Nov 18 12:31:29 2004 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.13 2004/04/27 11:24:31 markd Exp $
+$NetBSD: patch-aa,v 1.14 2004/11/18 12:31:29 markd Exp $
 
---- configure.ac.orig  2004-03-20 04:15:44.000000000 +1300
+--- configure.ac.orig  2004-09-17 23:20:14.000000000 +1200
 +++ configure.ac
 @@ -171,7 +171,7 @@ AC_ARG_ENABLE([R-shlib],
  [want_R_shlib="${want_R_framework}"])
  AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes])
  if test "${want_R_shlib}" = yes; then
--  LIBR="-L\$(R_HOME)/bin -lR"
-+  LIBR="-Wl,-R${prefix}/lib/R/bin -L\$(R_HOME)/bin -lR"
+-  LIBR="-L\$(R_HOME)/lib -lR"
++  LIBR="-Wl,-R${prefix}/lib/R/lib -L\$(R_HOME)/lib -lR"
  else
    LIBR=
  fi
-@@ -477,9 +477,9 @@ AC_SUBST(LIBM)
+@@ -491,9 +491,9 @@ AC_SUBST(LIBM)
  ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
  ## the following as well.
  AC_CHECK_LIB(m, sin)
@@ -24,7 +24,7 @@
  case "${host_os}" in
    darwin*)
      AM_CONDITIONAL(BUILD_DLFCN_DARWIN, true)
-@@ -634,13 +634,6 @@ case "${host_cpu}" in
+@@ -654,13 +654,6 @@ case "${host_cpu}" in
        R_PROG_CC_FLAG([-ieee_with_inexact],
                       R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
      fi
@@ -38,7 +38,7 @@
      if test "${GXX}" = yes; then
        R_PROG_CXX_FLAG([-mieee],
                        R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
-@@ -933,6 +926,7 @@ case "${host_os}" in
+@@ -958,6 +951,7 @@ case "${host_os}" in
      fpicflags=
      ;;
    netbsd*)
diff -r 2733e99aec7c -r 525d15e1b982 math/R/patches/patch-ab
--- a/math/R/patches/patch-ab   Thu Nov 18 12:30:49 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.15 2003/12/03 12:05:18 markd Exp $
-
---- aclocal.m4.orig    2003-09-27 18:08:39.000000000 +1200
-+++ aclocal.m4
-@@ -572,6 +572,7 @@ ${F77} ${FFLAGS} -c conftestf.f 1>&AS_ME
- #else
- # define F77_SYMBOL(x)   x
- #endif
-+int MAIN__ () { return 0; }
- int main () {
-   exit(0);
- }
-@@ -633,6 +634,9 @@ ${F77} ${FFLAGS} -c conftestf.f 1>&AS_ME
- 
- extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
- 
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
-   int a[3] = {17, 237, 2000000000}, b[2], res = 0;
-   double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -714,6 +718,9 @@ typedef struct {
- 
- extern void F77_SYMBOL(cftest)(Rcomplex *x);
- 
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
-     Rcomplex z[3];
-     
diff -r 2733e99aec7c -r 525d15e1b982 math/R/patches/patch-ac
--- a/math/R/patches/patch-ac   Thu Nov 18 12:30:49 2004 +0000
+++ b/math/R/patches/patch-ac   Thu Nov 18 12:31:29 2004 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.12 2004/04/27 11:24:31 markd Exp $
+$NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $
 
---- configure.orig     2004-04-12 21:28:02.000000000 +1200
+--- configure.orig     2004-09-21 11:05:49.000000000 +1200
 +++ configure
-@@ -2193,7 +2193,7 @@ else
+@@ -2204,7 +2204,7 @@ else
    WANT_R_SHLIB_FALSE=
  fi
  if test "${want_R_shlib}" = yes; then
--  LIBR="-L\$(R_HOME)/bin -lR"
-+  LIBR="-Wl,-R${prefix}/lib/R/bin -L\$(R_HOME)/bin -lR"
+-  LIBR="-L\$(R_HOME)/lib -lR"
++  LIBR="-Wl,-R${prefix}/lib/R/lib -L\$(R_HOME)/lib -lR"
  else
    LIBR=
  fi
-@@ -20883,13 +20932,13 @@ _ACEOF
+@@ -21299,13 +21299,13 @@ _ACEOF
  fi
  
  
@@ -29,7 +29,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20927,35 +20977,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21344,35 +21344,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -76,7 +76,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20993,35 +21044,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21411,35 +21411,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -123,7 +123,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21059,25 +21111,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21478,25 +21478,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -156,7 +156,7 @@
  
  fi
  
-@@ -25738,6 +25851,7 @@ cat > conftest.c <<EOF
+@@ -26355,6 +26355,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -164,7 +164,7 @@
  int main () {
    exit(0);
  }
-@@ -25806,6 +25920,9 @@ cat > conftest.c <<EOF
+@@ -26423,6 +26424,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -174,7 +174,7 @@
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -25894,6 +26011,9 @@ typedef struct {
+@@ -26511,6 +26515,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -184,7 +184,7 @@
  int main () {
      Rcomplex z[3];
  
-@@ -27020,155 +27149,6 @@ echo "${ECHO_T}no" >&6
+@@ -27651,157 +27658,6 @@ echo "${ECHO_T}no" >&6
  fi
  
      fi
@@ -216,7 +216,8 @@
 -  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'
+-       { ac_try='test -z "$ac_f77_werror_flag"
+-                       || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -290,7 +291,8 @@
 -  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'
+-       { ac_try='test -z "$ac_f77_werror_flag"
+-                       || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -340,7 +342,7 @@
      if test "${GXX}" = yes; then
        ac_safe=_mieee
  echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -28101,6 +28087,7 @@ fi ;;
+@@ -28751,6 +28607,7 @@ fi ;;
      fpicflags=
      ;;
    netbsd*)



Home | Main Index | Thread Index | Old Index