 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.106 2010/02/09 07:02:53 adam Exp $
+# $NetBSD: Makefile,v 1.107 2010/05/06 07:33:40 adam Exp $
-DISTNAME=		R-2.10.1
+DISTNAME=		R-2.11.0
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://www.R-project.org/
 COMMENT=		Statistical language for data analysis and graphics
 #needs FPC code not found in older versions of NetBSD
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 			NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 @@ -52,26 +52,27 @@ CONFIGURE_ARGS+=	--without-libmoto
 # and other failures due to not linking to support libs during testing
 CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm=yes
 CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm_=yes
 CONFIGURE_ENV+=		r_cv_complete_blas=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}
 CONFIGURE_ENV+=		lt_cv_path_LD=${LD:Q}
 CONFIGURE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
 CONFIGURE_ENV+=		ac_cv_path_R_GZIPCMD=${TOOLS_GZIP_CMD}
 CONFIGURE_ENV+=		ac_cv_path_R_UNZIPCMD=${TOOLS_PATH.unzip}
 CONFIGURE_ENV+=		r_cv_prog_f77_flag_mieee=no
 # Package assumes it can append to files (specifically DESCRIPTION) that have
 # been installed SHAREMODE
 SHAREMODE=		644
 .include "../../mk/bsd.prefs.mk"
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
 .if defined(PAPERSIZE)
 R_PAPERSIZE?=		${PAPERSIZE}
 .else
 R_PAPERSIZE?=		A4
 .endif

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2009/12/11 18:53:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/05/06 07:33:40 adam Exp $
 bin/R
 bin/Rscript
 lib/R/COPYING
 lib/R/NEWS
 lib/R/SVN-REVISION
 lib/R/bin/BATCH
 lib/R/bin/COMPILE
 lib/R/bin/INSTALL
 lib/R/bin/LINK
 lib/R/bin/R
 lib/R/bin/REMOVE
 lib/R/bin/Rcmd
 lib/R/bin/Rd2dvi
 @@ -1027,26 +1027,33 @@ lib/R/library/survival/data/us2000.dat
 lib/R/library/survival/data/us2001.dat
 lib/R/library/survival/data/us2002.dat
 lib/R/library/survival/data/us2003.dat
 lib/R/library/survival/data/us2004.dat
 lib/R/library/survival/data/usdecennial.dat
 lib/R/library/survival/data/usinfant.dat
 lib/R/library/survival/help/AnIndex
 lib/R/library/survival/help/aliases.rds
 lib/R/library/survival/help/paths.rds
 lib/R/library/survival/help/survival.rdb
 lib/R/library/survival/help/survival.rdx
 lib/R/library/survival/html/00Index.html
 lib/R/library/survival/libs/survival.so
 lib/R/library/survival/noweb/Makefile
 lib/R/library/survival/noweb/Readme
 lib/R/library/survival/noweb/main.Rnw
 lib/R/library/survival/noweb/noweb.sty
 lib/R/library/survival/noweb/nwmac.tex
 lib/R/library/survival/noweb/predict.coxph.Rnw
 lib/R/library/survival/noweb/residuals.survreg.Rnw
 lib/R/library/tcltk/DESCRIPTION
 lib/R/library/tcltk/INDEX
 lib/R/library/tcltk/Meta/Rd.rds
 lib/R/library/tcltk/Meta/demo.rds
 lib/R/library/tcltk/Meta/hsearch.rds
 lib/R/library/tcltk/Meta/links.rds
 lib/R/library/tcltk/Meta/nsInfo.rds
 lib/R/library/tcltk/Meta/package.rds
 lib/R/library/tcltk/NAMESPACE
 lib/R/library/tcltk/R/tcltk
 lib/R/library/tcltk/R/tcltk.rdb
 lib/R/library/tcltk/R/tcltk.rdx
 lib/R/library/tcltk/demo/tkcanvas.R

 @@ -1,254 +1,102 @@
-$NetBSD: patch-ac,v 1.24 2009/12/11 18:53:40 adam Exp $
+$NetBSD: patch-ac,v 1.25 2010/05/06 07:33:41 adam Exp $
---- configure.orig	2009-10-15 04:06:36.000000000 +0200
+--- configure.orig	2010-03-31 22:10:52.000000000 +0000
 +++ configure
-@@ -2719,7 +2719,7 @@ fi
+@@ -3755,7 +3755,7 @@ fi
  if test "${want_R_shlib}" = yes; then
 -  LIBR="-L\$(R_HOME)/lib\$(R_ARCH) -lR"
 +  LIBR="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH) -lR"
  else
    LIBR=
  fi
-@@ -28544,6 +28544,7 @@ cat > conftest.c <<EOF
+@@ -23591,6 +23591,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
 +int MAIN__ () { return 0; }
  int main () {
    exit(0);
+ }
-@@ -28621,6 +28622,9 @@ cat > conftest.c <<EOF
+@@ -23667,6 +23668,9 @@ cat > conftest.c <<EOF
  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];
-@@ -28718,6 +28722,9 @@ typedef struct {
+@@ -23762,6 +23766,9 @@ typedef struct {
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
 +int MAIN_ () { return 0; }
 +int MAIN__ () { return 0; }
++
  int main () {
      Rcomplex z[3];
-@@ -29802,151 +29809,6 @@ echo "${ECHO_T}no" >&6; }
+@@ -25918,7 +25925,7 @@ $as_echo "$as_me: WARNING: Use of flat n
  fi
      fi
 -    if test "${G77}" = yes; then
 -      ac_safe=_mieee
 -{ echo "$as_me:$LINENO: checking whether ${F77} accepts -mieee" >&5
 -echo $ECHO_N "checking whether ${F77} accepts -mieee... $ECHO_C" >&6; }
 -if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 -r_save_FFLAGS="${FFLAGS}"
 -FFLAGS="${FFLAGS} -mieee"
 -cat >conftest.$ac_ext <<_ACEOF
 -      program main
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -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_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (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
 -sed 's/^/| /' conftest.$ac_ext >&5
 -	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
 -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
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -fi
 -if eval "test \"`echo '$r_cv_prog_f77_flag_'$ac_safe`\" = yes"; then
 -  { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -  separator=""
 -test -z "${separator}" && separator=" "
 -if test -z "${R_XTRA_FFLAGS}"; then
 -  R_XTRA_FFLAGS="-mieee"
 -else
 -  R_XTRA_FFLAGS="${R_XTRA_FFLAGS}${separator}-mieee"
 -fi
 -else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -fi
 -    else
 -      ac_safe=_fpe3
 -{ echo "$as_me:$LINENO: checking whether ${F77} accepts -fpe3" >&5
 -echo $ECHO_N "checking whether ${F77} accepts -fpe3... $ECHO_C" >&6; }
 -if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 -r_save_FFLAGS="${FFLAGS}"
 -FFLAGS="${FFLAGS} -fpe3"
 -cat >conftest.$ac_ext <<_ACEOF
 -      program main
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -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_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (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
 -sed 's/^/| /' conftest.$ac_ext >&5
 -	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
 -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
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -fi
 -if eval "test \"`echo '$r_cv_prog_f77_flag_'$ac_safe`\" = yes"; then
 -  { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -  separator=""
 -test -z "${separator}" && separator=" "
 -if test -z "${R_XTRA_FFLAGS}"; then
 -  R_XTRA_FFLAGS="-fpe3"
 -else
 -  R_XTRA_FFLAGS="${R_XTRA_FFLAGS}${separator}-fpe3"
 -fi
 -else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -fi
 -    fi
      if test "${GXX}" = yes; then
        ac_safe=_mieee
  { echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
@@ -31453,7 +31315,7 @@ echo "$as_me: WARNING: Use of flat names
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
 -  freebsd*)
 +  freebsd* | dragonfly*)
      ## Only sure for FreeBSD 3 and above.
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
-@@ -31542,6 +31404,12 @@ echo "$as_me: WARNING: Use of flat names
+@@ -26007,6 +26014,12 @@ $as_echo "$as_me: WARNING: Use of flat n
      fcpicflags=
      ;;
    netbsd*)
 +    fpicflags="-fPIC"
 +    case "${host_cpu}" in
 +      powerpc*)
 +	cpicflags="-fPIC"
 +	;;
 +    esac
      if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
        main_ldflags="-export-dynamic"
        shlib_ldflags="-shared"
-@@ -31641,7 +31509,7 @@ fi
+@@ -26104,7 +26117,7 @@ fi
  : ${FPICFLAGS="${fpicflags}"}
  if test -z "${FPICFLAGS}"; then
    case "${host_os}" in
 -    aix*|cygwin*|irix*|mingw*|osf*)
 +    aix*|cygwin*|irix*|mingw*|osf*|darwin*)
        ;;
      *)
-       { echo "$as_me:$LINENO: WARNING: I could not determine FPICFLAGS." >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine FPICFLAGS." >&5
-@@ -38017,6 +37885,15 @@ cat > conftest.c <<EOF
+@@ -29156,6 +29169,15 @@ cat > conftest.c <<EOF
  #endif
  extern void F77_SYMBOL(test1)(int *iflag);
 +#ifdef F77_DUMMY_MAIN
++
 +#  ifdef __cplusplus
 +     extern "C"
 +#  endif
 +   int F77_DUMMY_MAIN() { return 1; }
++
 +#endif
++
  int main () {
    int iflag;
    F77_SYMBOL(test1)(&iflag);
-@@ -38084,6 +37961,14 @@ else
+@@ -29223,6 +29245,14 @@ else
  #else
  # define F77_SYMBOL(x)   x
  #endif
 +#ifdef F77_DUMMY_MAIN
++
 +#  ifdef __cplusplus
 +     extern "C"
 +#  endif
 +   int F77_DUMMY_MAIN() { return 1; }
++
 +#endif
  void F77_SYMBOL(xerbla)(char *srname, int *info)
  {}

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2010/02/09 07:02:53 adam Exp $
+$NetBSD: distinfo,v 1.43 2010/05/06 07:33:41 adam Exp $
-SHA1 (R-2.10.1.tar.gz) = f5b1969fde3642c233f5198e44a7bf17a7b85ab6
+SHA1 (R-2.11.0.tar.gz) = 86af359879afaf18bf0cd9ca36f2957d7b146ba3
-RMD160 (R-2.10.1.tar.gz) = 7acf060192f205da4731d0ea3c2cc318b65b7e91
+RMD160 (R-2.11.0.tar.gz) = 358d5ba19bd534e9f5be56f517bd217c235599dc
-Size (R-2.10.1.tar.gz) = 19705604 bytes
+Size (R-2.11.0.tar.gz) = 19779908 bytes
-SHA1 (patch-ab) = c70f9f94bace4129b81f19d8802ae1de50c9f24e
+SHA1 (patch-ab) = 629c8d5f9d2278c97f48fb55c0e5172a0aea58b2
-SHA1 (patch-ac) = eda258c5be9630fac013ea1f5a6785de299c1509
+SHA1 (patch-ac) = 53b4e331d8887a469e74662c1a19ad5571ed72d6
-SHA1 (patch-ad) = 5c6fd9f68d8fe4a12147d94c07590025427878fc
+SHA1 (patch-ad) = 43ae23bd0815986c3bac661bd3354cd96b3e54e4

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.19 2009/12/11 18:53:40 adam Exp $
+$NetBSD: patch-ab,v 1.20 2010/05/06 07:33:41 adam Exp $
---- src/include/Defn.h.orig	2009-09-30 04:05:04.000000000 +0200
+--- src/include/Defn.h.orig	2010-03-25 08:31:54.000000000 +0000
 +++ src/include/Defn.h
-@@ -1232,7 +1232,7 @@ extern char *locale2charset(const char *
+@@ -1243,7 +1243,7 @@ extern char *locale2charset(const char *
  # ifdef HAVE_ALLOCA_H
  #  include <alloca.h>
  # endif
 -# if !HAVE_DECL_ALLOCA  && !defined(__FreeBSD__)
 +# if !HAVE_DECL_ALLOCA  && !defined(__FreeBSD__) && !defined(__DragonFly__)
  extern char *alloca(size_t);
  # endif
  #endif

 @@ -1,18 +1,18 @@
-$NetBSD: patch-ad,v 1.13 2009/12/11 18:53:40 adam Exp $
+$NetBSD: patch-ad,v 1.14 2010/05/06 07:33:41 adam Exp $
---- src/main/Makefile.in.orig	2009-10-14 04:05:03.000000000 +0200
+--- src/main/Makefile.in.orig	2010-03-25 08:32:02.000000000 +0000
 +++ src/main/Makefile.in
-@@ -97,13 +97,13 @@ EXTRA_STATIC_LIBS = \
+@@ -96,13 +96,13 @@ EXTRA_STATIC_LIBS = \
    $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(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@R_bin_LDADD = libR.a $(EXTRA_LIBS)
  ## Linked against -lRblas becasue -lR is and otherwise ld complains.
 -@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@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp