Update R to 1.3.0. This is a two-generation upgrade from the previous 1.1.1

version in pkgsrc.  There are many, many bugfixes, better compliance with
S3/S4, and many additional statistical analysis functions added to the
base library.  There is also an improved (faster) garbage collector and
support for dynamically sizing the memory used by R.  The full summary of
changes may be found on the R Project website.

4 files changed, 67 insertions, 52 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 2130f20582b..2b14e855a24 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2001/06/12 20:33:05 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.25 2001/07/23 13:14:44 jlam Exp $
 
-DISTNAME=		R-1.1.1
+DISTNAME=		R-1.3.0
 CATEGORIES=		math
-MASTER_SITES=		http://cran.r-project.org/src/base/ \
+MASTER_SITES=		http://lib.stat.cmu.edu/R/CRAN/src/base/ \
+			http://cran.r-project.org/src/base/ \
 			ftp://cran.r-project.org/pub/R/src/base/ \
-			http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 			http://cran.stat.wisc.edu/src/base/ \
 			http://SunSITE.auc.dk/R/src/base/ \
 			ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/ \
@@ -18,36 +17,41 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.R-project.org/
-COMMENT=		Statistical language for data analysis and graphics
 
 BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-DEPENDS+=		readline>=4.0:../../devel/readline
-DEPENDS+=		jpeg-*:../../graphics/jpeg
-DEPENDS+=		png>=1.0.11:../../graphics/png
-
-# Requires IEEE math
-NOT_FOR_PLATFORM=	*-*-alpha
 
-USE_FORTRAN=		# defined
+USE_BUILDLINK_ONLY=	# defined
 USE_X11=		# defined
 USE_PERL5=		# defined
 USE_GMAKE=		# defined
+USE_GNU_READLINE=	# uses callback interface
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ARGS+=	--without-gnome			# not yet stable
-CONFIGURE_ARGS+=	--without-tcltk			# not yet stable
+CONFIGURE_ARGS+=	--with-tcltk
+CONFIGURE_ARGS+=	--with-tcl-config=${BUILDLINK_DIR}/lib/tclConfig.sh
+CONFIGURE_ARGS+=	--with-tk-config=${BUILDLINK_DIR}/lib/tkConfig.sh
+CONFIGURE_ARGS+=	--without-gnome		# not yet stable
+CONFIGURE_ENV+=		XMKMF="${XMKMF}"
+
+# Use BLAS (math/blas)
+#
 CONFIGURE_ARGS+=	--without-atlas
-CONFIGURE_ARGS+=	--without-blas
+CONFIGURE_ARGS+=	--with-blas
 CONFIGURE_ARGS+=	--without-blas_risc
 CONFIGURE_ARGS+=	--without-dxml
 CONFIGURE_ARGS+=	--without-libmoto
 
-CONFIGURE_ENV+=		MAKE="${MAKE_PROGRAM}"
+# Work around missing MAIN__() definition used in -lF77 by AC_CHECK_LIB.
+CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm=yes
+CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm_=yes
 
-CPPFLAGS+=		-I${LOCALBASE}/include		# readline/readline.h
-LIBS+=			-ltermcap			# -lreadline -ltermcap
+# Pass the Fortran compiler to the configure script in case it's overridden
+# by the package builder.
+#
+USE_FORTRAN=		# defined
+CONFIGURE_ENV+=		FC="${FC}"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -72,8 +76,11 @@ PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 R_LIBDIR=		${PREFIX}/lib/R
 INSTALL_DIRS=		${R_LIBDIR}
 
+REPLACE_BUILDLINK=	src/scripts/R.fe
+REPLACE_BUILDLINK_SED=	-e "s|${BUILDLINK_DIR}/|${LOCALBASE}/|g"
+
 pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --force
 
 # Generate the PLIST dynamically as it changes in each version only in a
 # specific subtree.  This will make maintaining this package a little easier
@@ -83,15 +90,21 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${R_LIBDIR}
 	${RM} -f ${PLIST_SRC}
 	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
-	( cd ${PREFIX}; \
-	  for dir in ${INSTALL_DIRS}; do \
+	( cd ${PREFIX};							\
+	  for dir in ${INSTALL_DIRS}; do				\
 		${FIND} $${dir#${PREFIX}/} \( -type f -or -type l \) -print; \
-	  done; \
-	) | sort -u >> ${PLIST_SRC}
-	( cd ${PREFIX}; \
-	  for dir in ${INSTALL_DIRS}; do \
-		${FIND} $${dir#${PREFIX}/} -type d -print; \
-	  done; \
-	) | sort -ur | ${SED} -e "s,^,@dirrm ," >> ${PLIST_SRC}
+	  done;								\
+	) | ${SORT} -u >> ${PLIST_SRC}
+	( cd ${PREFIX};							\
+	  for dir in ${INSTALL_DIRS}; do				\
+		${FIND} $${dir#${PREFIX}/} -type d -print;		\
+	  done;								\
+	) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |" >> ${PLIST_SRC}
 
+.include "../../devel/readline/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../math/blas/buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R/distinfo b/math/R/distinfo
index f8988627768..60a2e7c7ec5 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/05/03 01:54:15 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/07/23 13:14:44 jlam Exp $
 
-SHA1 (R-1.1.1.tgz) = c1d66c22c6b4e0ebb7bb5f1dcf52b33a997b7e6b
-Size (R-1.1.1.tgz) = 3046615 bytes
-SHA1 (patch-aa) = 2613aab78c571b15a33003587a377c5e363063d3
-SHA1 (patch-ab) = 3d100cbe3448e65cd798b97999a6ce8cd2487785
+SHA1 (R-1.3.0.tgz) = 9e59492f0f2bb5dbf3e324e9f92046882aa9f344
+Size (R-1.3.0.tgz) = 4423354 bytes
+SHA1 (patch-aa) = 588b85346a942f54bf27de4115ee2d7bbec270cb
+SHA1 (patch-ab) = ef2832039b92a5c5c323b7c61039f2ccd3d067e8
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index 45a1589cdd9..5e34f8635a6 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2000/08/16 19:04:43 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/07/23 13:14:44 jlam Exp $
 
---- configure.in.orig	Sun Jul 30 18:46:45 2000
-+++ configure.in	Wed Aug 16 13:56:09 2000
-@@ -321,10 +321,6 @@
+--- configure.in.orig	Sun Jun 17 12:41:20 2001
++++ configure.in
+@@ -380,9 +380,9 @@
  if ${use_libmoto}; then
    AC_CHECK_LIB(moto, sin)
  fi
 -AC_CHECK_LIB(ncurses, main,,
 -  AC_CHECK_LIB(termcap, main,,
 -    AC_CHECK_LIB(termlib, main)
--))
++AC_CHECK_LIB(termcap, main,,
++  AC_CHECK_LIB(termlib, main,,
++    AC_CHECK_LIB(ncurses, main)
+ ))
  AC_CHECK_LIB(dl, dlopen)
  AC_CHECK_LIB(z, main)
- 
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index fad75193ce8..d9acfd39238 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.9 2001/05/03 01:54:16 jtb Exp $
+$NetBSD: patch-ab,v 1.10 2001/07/23 13:14:44 jlam Exp $
 
---- aclocal.m4.orig	Sun Jul 30 22:46:45 2000
-+++ aclocal.m4
-@@ -400,6 +400,9 @@
-   printf("number of errors %d\n", res);
-   return(res);
- }
+--- acinclude.m4.orig	Sun Jun 17 12:42:16 2001
++++ acinclude.m4
+@@ -456,6 +456,9 @@
+ 
+ extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
+ 
++int MAIN_ () { return 0; }
++int MAIN__ () { return 0; }
 +
-+void MAIN__(void){abort();}
-+
- EOF
-       changequote([, ])
-       if ${CC-cc} ${CFLAGS} -c conftest.c 1>&AC_FD_CC 2>&AC_FD_CC; then
+ int main () {
+   int a[3] = {17, 237, 2000000000}, b[2], res = 0;
+   double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];