summaryrefslogtreecommitdiff
path: root/math/R
diff options
context:
space:
mode:
authormarkd <markd>2002-12-10 11:58:10 +0000
committermarkd <markd>2002-12-10 11:58:10 +0000
commit648580afa826958b469f795f7a74a59c280e8785 (patch)
treeb346d60a32f3bbbdfdc9872b7e2c929dbff2797b /math/R
parentb879dbec39bfecc3362313b8628cc7c6279a091f (diff)
downloadpkgsrc-648580afa826958b469f795f7a74a59c280e8785.tar.gz
Update R to version 1.6.1.
Pkgsrc changes: Now builds the libR.so and provides a buildlink2.mk for packages that want to use it. From suggestions from Kent Polk. Recommended library set is now included in the base package. Changes: CHANGES IN R VERSION 1.6.1 NEW FEATURES o Added a few "trivial and obviously missing" functions to tcltk: tkchooseDirectory, tkpopup, tkdialog, tkread o barplot() has a new argument `axis.lty', which if set to 1 allows the pre-1.6.0 behaviour of plotting the axis and tick marks for the categorical axis. (This was apparently not intentional, but axis() used to ignore lty=0.) The argument `border' is no longer ".NotYetUsed". CHANGES IN R VERSION 1.6.0 USER-VISIBLE CHANGES o The default colour palette now has "grey" instead of "white" in location 8. See palette(). o grid(nx) behaves differently (but the same as in R versions <= 0.64). NEW FEATURES o Preparations for name space support: o The objects created in the methods package to represent classes, generic functions, method definitions, and inheritance relations now themselves belong to true classes. In particular, the "classRepresentation" objects follow the description in "Programming with Data" (section 7.6). o Other additions and changes to the methods package: o New methods ([[, print, str) and extended plot() method (incl. logical `horiz') for "dendrogram" class. o sprintf() now checks the agreement between formats and object types, and handles special values (NA, Inf, ...) correctly. o chol() now uses a tolerance for non-positive-definiteness and so should give more consistent results across platforms. o New function agrep() for approximate (fuzzy) string matching. o help.search() can now use both approximate (fuzzy) and regular expression matching. By default, if the pattern to be matched consists of only alphanumeric characters, whitespace or a dash, approximate matching is used. o axis() has three new optional arguments `col', `lty', and `lwd' all for drawing the axis line and tick marks. o Function vcov() (formerly in MASS), a generic function to return the variance-covariance matrix of the parameter estimates of a fitted model. o duplicated() and unique() have methods for matrices and arrays (based on ideas from Jens Oehlschl<E4>gel). o Internally memory sizes and counts of cons cells are now stored in unsigned longs. This allows memory limits to be set and objects created in the range 2-4Gb on 32-bit platforms, and allows 64-bit platforms to use much larger amounts of memory. o Command-line flags to set memory can now use the suffix `G' for gigabytes. The setting of maximum vsize is now only limited by the platform's address space. o All warning and error messages are truncated to a length set by options(warning.length=), defaulting to 1000. (Previously most (but not quite all) were truncated at 8192 characters.) o [dpqr]gamma() check for shape parameter > 0. o as.POSIX[cl]t can now convert logical NAs. o All installed packages (even those shipped with R) are given a `Built' field in the DESCRIPTION file. o as.data.frame() now coerces logical matrices into logical columns (rather than factors). o [[<-.data.frame no longer coerces character replacement values to factor. This is consistent with using $ to replace and with S4. o library() attempts to detect improperly installed packages, so as from this version an installed package must have a DESCRIPTION file and that file must have been stamped with a `Built:' line (which was introduced in 1.2.0). Under Unix-alikes, the platform is checked against that used for installation. o print.factor() has new arguments `max.levels' (with a smart default) and `width'. print.ordered() is no longer needed. o RNGkind() has an additional option for normal random generators: "Inversion". o data.frame() recycles factors and "AsIs" objects as well as atomic vectors. o rect() accepts additional graphics parameters through a ... argument (in the same way as polygon). o strwidth/strheight() now coerce their first argument in exactly the same way text() does, so a wider range of inputs is allowed. o prompt()'s default and data.frame methods have a new 3rd argument `name' allowing them to used more easily in scripts and loops. o rgb() has a new `maxColorValue' argument, allowing r,g,b in [0,M], particularly in {0:255}, efficiently and non-error-prone. o summaryRprof() provides the functionality of R CMD Rprof in R code, though more slowly. o pdf() now uses PDF not R code for clipping, which ensures that partially visible text strings are (partially) shown. o Each R session uses a per-session temporary directory which is removed at normal termination. The directory name is given by the tempdir() function, and filenames returned by tempfile() will be within that directory. o help.start() on Unix now uses a .R subdirectory of the per-session temporary directory and not ~/.R. A side effect is that ~/.R is now never deleted by R. o cbind/rbind() used to ignore all zero-length vectors, an undocumented quirk for S-compatibility. This caused problems when combining zero-extent matrices and zero-length vectors, and now zero-length vectors are ignored unless the result would have zero rows/columns. o plot.spec(x) now also works for other x than AR and Pgram results. o New functions La.chol() and La.chol2inv() for Cholesky decomposition and inverse of positive definite matrices using Lapack. o Changes to the tcltk package o New function axTicks() returning tick mark locations like axis(). o grid() has a more sensible default behavior. Tick axis alignment only happens when no numbers of grid cells are specified. New arguments lwd and equilogs; nx/ny = NA for not drawing, see ?grid. o installed.packages() has a new argument `priority'. o termplot() uses factor levels rather than 1,2,3... for x-axis. o The trace() function has been robustified and a new function tracingState() added to turn tracing temporarily on and off. o New cophenetic() in "mva" as utility for hierarchical clustering. o p.adjust() has two new methods, 'Hommel' and 'FDR', contributed by Gordon Smyth <smyth@wehi.edu.au>. o stars() now has add and plot arguments. and lots of bug fixes.
Diffstat (limited to 'math/R')
-rw-r--r--math/R/Makefile5
-rw-r--r--math/R/Makefile.extension4
-rw-r--r--math/R/buildlink2.mk26
-rw-r--r--math/R/distinfo27
-rw-r--r--math/R/patches/patch-aa23
-rw-r--r--math/R/patches/patch-ab8
-rw-r--r--math/R/patches/patch-ac41
-rw-r--r--math/R/patches/patch-ad21
-rw-r--r--math/R/patches/patch-ae17
-rw-r--r--math/R/patches/patch-af17
-rw-r--r--math/R/patches/patch-ag17
-rw-r--r--math/R/patches/patch-ah17
-rw-r--r--math/R/patches/patch-ai17
-rw-r--r--math/R/patches/patch-aj17
-rw-r--r--math/R/patches/patch-ak17
-rw-r--r--math/R/patches/patch-al17
-rw-r--r--math/R/patches/patch-am17
-rw-r--r--math/R/patches/patch-an17
-rw-r--r--math/R/patches/patch-ao17
-rw-r--r--math/R/patches/patch-ap17
-rw-r--r--math/R/patches/patch-aq17
21 files changed, 328 insertions, 48 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 272245b4e81..52d8c6d4260 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2002/10/31 23:30:36 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2002/12/10 11:58:10 markd Exp $
-DISTNAME= R-1.5.1
+DISTNAME= R-1.6.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/}
EXTRACT_SUFX= .tgz
@@ -20,6 +20,7 @@ USE_GMAKE= # defined
USE_GNU_READLINE= # uses callback interface
GNU_CONFIGURE= # defined
+CONFIGURE_ARGS+= --enable-R-shlib
CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --with-tcltk
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index f4aeada6de1..09f5569044f 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.2 2002/09/23 13:41:15 markd Exp $
+# $NetBSD: Makefile.extension,v 1.3 2002/12/10 11:58:10 markd Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${R_PKGNAME}
NO_BUILD= YES
do-install:
- R CMD INSTALL ${WRKDIR}/${R_PKGNAME}
+ R_LIBS= ${LOCALBASE}/bin/R CMD INSTALL ${WRKDIR}/${R_PKGNAME}
# automatically generate the PLIST
R_LIB= lib/R/library
diff --git a/math/R/buildlink2.mk b/math/R/buildlink2.mk
new file mode 100644
index 00000000000..3ec7fc38a42
--- /dev/null
+++ b/math/R/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/12/10 11:58:10 markd Exp $
+#
+# This Makefile fragment is included by packages that use the R shared library.
+#
+
+.if !defined(R_BUILDLINK2_MK)
+R_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= R
+BUILDLINK_DEPENDS.R?= R>=1.6.1
+BUILDLINK_PKGSRCDIR.R?= ../../math/R
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.R=R
+BUILDLINK_PREFIX.R_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.R= lib/R/bin/libR.*
+BUILDLINK_FILES.R+= lib/R/include/*
+BUILDLINK_FILES.R+= lib/R/include/R_ext/*
+
+BUILDLINK_CPPFLAGS.R= -I${BUILDLINK_PREFIX.R}/lib/R/include
+BUILDLINK_LDFLAGS.R= -L${BUILDLINK_PREFIX.R}/lib/R/bin -Wl,-R${BUILDLINK_PREFIX.R}/lib/R/bin
+
+BUILDLINK_TARGETS+= R-buildlink
+
+R-buildlink: _BUILDLINK_USE
+
+.endif # R_BUILDLINK2_MK
diff --git a/math/R/distinfo b/math/R/distinfo
index a911529eea5..9ccff9a060d 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,8 +1,21 @@
-$NetBSD: distinfo,v 1.10 2002/09/09 00:59:01 markd Exp $
+$NetBSD: distinfo,v 1.11 2002/12/10 11:58:10 markd Exp $
-SHA1 (R-1.5.1.tgz) = 3c0a09461ad49118935ed97fafb7076e690e59de
-Size (R-1.5.1.tgz) = 5452320 bytes
-SHA1 (patch-aa) = 6c2ad392e10ad51c7af717fd39f25b82ea2ed25c
-SHA1 (patch-ab) = 4704a191118a00bcddd09a0066322f35581653da
-SHA1 (patch-ac) = 4103e0197196fa96454e194c56bf169ccbc373d9
-SHA1 (patch-ad) = 92992b9485aeb6c132ea0e9fa80f66426cbfab83
+SHA1 (R-1.6.1.tgz) = 6f01abd81cb8ea28205e6511b0ecda826bcbaa84
+Size (R-1.6.1.tgz) = 8633830 bytes
+SHA1 (patch-aa) = 8ec7504d5c08e4258b0b1a433aed8760f630089e
+SHA1 (patch-ab) = a3bd4d27abbc7f26e223aaa1e559ccfc0e363c39
+SHA1 (patch-ac) = be0bb888da999cc571f048752204d478efa3d6ac
+SHA1 (patch-ad) = b9a08c37baaef8a7169208b758494a077ca531d6
+SHA1 (patch-ae) = 83f0f66d9b135eb81572e7f0be56c02bd95e44d1
+SHA1 (patch-af) = cf00c9bf60bf92aa27c33d750f55184c86be02f1
+SHA1 (patch-ag) = a4312c4f64ca0af1ee425ce25bef5fe06212e580
+SHA1 (patch-ah) = 37e2b7466ced465a412d1792fbcd17159f09aabf
+SHA1 (patch-ai) = 8a815753bbc2de4785b19ee3b3c2df4c9ca26578
+SHA1 (patch-aj) = 0a75114a5b34739f05418739c65e44e87ce024fb
+SHA1 (patch-ak) = 737a2329d14f5c6e516cf44cf66af421fc9a4b1c
+SHA1 (patch-al) = a2c582dd463bd85c6670ca981214c4a27bbdca5f
+SHA1 (patch-am) = 8ac2214f490f48f6cc780608b99cb07896a7fd7d
+SHA1 (patch-an) = dff4e97ca33fab0937c70b8dc3a8bcda799a4ab9
+SHA1 (patch-ao) = b94e2b6c8ad844be16f3dbcb9f96f7ba4f71094f
+SHA1 (patch-ap) = b2a273fe3865e8a7413762defb95966f54dd8de8
+SHA1 (patch-aq) = 36c7ad5c8ad0db9f9d879a196dfe9fb1dcc452d8
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index 99e8055c086..44190684f16 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.9 2002/09/09 00:59:02 markd Exp $
+$NetBSD: patch-aa,v 1.10 2002/12/10 11:58:11 markd Exp $
---- configure.ac.orig Wed May 1 06:04:05 2002
-+++ configure.ac Sun Sep 8 23:47:11 2002
-@@ -414,9 +414,9 @@
+--- configure.ac.orig Mon Oct 21 22:27:50 2002
++++ configure.ac
+@@ -148,7 +148,7 @@
+ [want_R_shlib=no])
+ 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"
+ else
+ LIBR=
+ fi
+@@ -412,9 +412,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)
@@ -15,7 +24,7 @@ $NetBSD: patch-aa,v 1.9 2002/09/09 00:59:02 markd Exp $
AC_CHECK_LIB(dl, dlopen)
## Readline.
-@@ -555,13 +555,6 @@
+@@ -555,13 +555,6 @@ case "${host_cpu}" in
R_PROG_CC_FLAG([-ieee_with_inexact],
[R_XTRA_CFLAGS="${R_XTRA_CFLAGS} -ieee_with_inexact"])
fi
@@ -29,11 +38,11 @@ $NetBSD: patch-aa,v 1.9 2002/09/09 00:59:02 markd Exp $
if test "${GXX}" = yes; then
R_PROG_CXX_FLAG([-mieee],
[R_XTRA_CXXFLAGS="${R_XTRA_CXXFLAGS} -mieee"])
-@@ -816,6 +809,7 @@
+@@ -821,6 +814,7 @@ case "${host_os}" in
fpicflags=
;;
netbsd*)
+ fpicflags="-fPIC"
- if ${CPP} - -dM < /dev/null | grep -q __ELF__; then
+ if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
main_ldflags="-export-dynamic"
shlib_ldflags="-shared"
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index d45f735b23f..568d1c61fcf 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2002/09/09 00:59:02 markd Exp $
+$NetBSD: patch-ab,v 1.14 2002/12/10 11:58:11 markd Exp $
---- aclocal.m4.orig Wed Jul 17 01:20:41 2002
+--- aclocal.m4.orig Mon Oct 21 22:28:00 2002
+++ aclocal.m4
-@@ -510,6 +514,9 @@
+@@ -522,6 +522,9 @@
extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.13 2002/09/09 00:59:02 markd Exp $
int main () {
int a[3] = {17, 237, 2000000000}, b[2], res = 0;
double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -587,6 +594,9 @@
+@@ -602,6 +605,9 @@
} Rcomplex;
extern void F77_SYMBOL(cftest)(Rcomplex *x);
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index f40eeef13c3..43d17416fe4 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
+$NetBSD: patch-ac,v 1.8 2002/12/10 11:58:11 markd Exp $
---- configure.orig Mon Jun 17 23:20:30 2002
-+++ configure Sun Sep 8 23:52:19 2002
-@@ -10666,13 +10666,13 @@
+--- configure.orig Fri Nov 1 22:48:07 2002
++++ configure
+@@ -2020,7 +2020,7 @@
+ 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"
+ else
+ LIBR=
+ fi
+@@ -10754,13 +10754,13 @@
fi
@@ -20,7 +29,7 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
-@@ -10704,33 +10704,33 @@
+@@ -10792,33 +10792,33 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -65,7 +74,7 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
-@@ -10762,33 +10762,33 @@
+@@ -10850,33 +10850,33 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -110,7 +119,7 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
-@@ -10820,23 +10820,23 @@
+@@ -10908,23 +10908,23 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -141,7 +150,7 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
fi
-@@ -14899,6 +14899,9 @@
+@@ -14975,6 +14975,9 @@
extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
@@ -151,7 +160,7 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
int main () {
int a[3] = {17, 237, 2000000000}, b[2], res = 0;
double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -14983,6 +14986,9 @@
+@@ -15063,6 +15066,9 @@
extern void F77_SYMBOL(cftest)(Rcomplex *x);
@@ -161,14 +170,14 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
int main () {
Rcomplex z[3];
-@@ -15870,121 +15876,6 @@
+@@ -16008,121 +16014,6 @@
fi
fi
- if test "${G77}" = yes; then
- ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
--echo "$as_me:$LINENO: checking whether ${F77-f77} accepts -mieee" >&5
--echo $ECHO_N "checking whether ${F77-f77} accepts -mieee... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking whether ${F77} accepts -mieee" >&5
+-echo $ECHO_N "checking whether ${F77} accepts -mieee... $ECHO_C" >&6
-if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
@@ -224,8 +233,8 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
-
- else
- ac_safe=`echo "-fpe3" | sed 'y%./+-:=%__p___%'`
--echo "$as_me:$LINENO: checking whether ${F77-f77} accepts -fpe3" >&5
--echo $ECHO_N "checking whether ${F77-f77} accepts -fpe3... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking whether ${F77} accepts -fpe3" >&5
+-echo $ECHO_N "checking whether ${F77} accepts -fpe3... $ECHO_C" >&6
-if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
@@ -283,11 +292,11 @@ $NetBSD: patch-ac,v 1.7 2002/09/09 00:59:03 markd Exp $
if test "${GXX}" = yes; then
ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -16719,6 +16610,7 @@
+@@ -16862,6 +16753,7 @@
fpicflags=
;;
netbsd*)
+ fpicflags="-fPIC"
- if ${CPP} - -dM < /dev/null | grep -q __ELF__; then
+ if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
main_ldflags="-export-dynamic"
shlib_ldflags="-shared"
diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad
index 5b36548219c..98618dcedd0 100644
--- a/math/R/patches/patch-ad
+++ b/math/R/patches/patch-ad
@@ -1,12 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2002/05/20 18:16:01 cjep Exp $
+$NetBSD: patch-ad,v 1.5 2002/12/10 11:58:12 markd Exp $
---- share/sh/help-links.sh.orig Wed May 23 02:46:18 2001
-+++ share/sh/help-links.sh
-@@ -35,6 +35,7 @@
- rm -f ${PKGLIST}
- rm -f ${SEARCHINDEX}
- cp ${R_HOME}/doc/html/packages-head.html ${PKGLIST}
-+chmod 644 ${PKGLIST}
+--- src/scripts/SHLIB.in.orig Wed Jul 17 19:36:11 2002
++++ src/scripts/SHLIB.in
+@@ -93,7 +93,7 @@
+ fi
- get_unique () {
- if test -r ${1}; then
+ if test -f ${R_HOME}/bin/libR@SHLIB_EXT@; then
+- LIBR="-L${R_HOME}/bin -lR"
++ LIBR="-Wl,-R@prefix@/lib/R/bin -L${R_HOME}/bin -lR"
+ else
+ LIBR=
+ fi
diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae
new file mode 100644
index 00000000000..386b5d2c591
--- /dev/null
+++ b/math/R/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.6 2002/12/10 11:58:12 markd Exp $
+
+--- src/library/base/Makefile.in.orig Mon Jul 22 00:32:05 2002
++++ src/library/base/Makefile.in Mon Dec 9 23:58:45 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
+ @for f in `ls -d $(srcdir)/data/* | sed '/CVS/d'`; do \
diff --git a/math/R/patches/patch-af b/math/R/patches/patch-af
new file mode 100644
index 00000000000..3279e85b5fa
--- /dev/null
+++ b/math/R/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.5 2002/12/10 11:58:12 markd Exp $
+
+--- src/library/ctest/Makefile.in.orig Mon Jul 22 00:32:06 2002
++++ src/library/ctest/Makefile.in Mon Dec 9 23:59:27 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ag b/math/R/patches/patch-ag
new file mode 100644
index 00000000000..6f18d1c40e8
--- /dev/null
+++ b/math/R/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.5 2002/12/10 11:58:13 markd Exp $
+
+--- src/library/eda/Makefile.in.orig Mon Jul 22 00:32:05 2002
++++ src/library/eda/Makefile.in Mon Dec 9 23:59:56 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ah b/math/R/patches/patch-ah
new file mode 100644
index 00000000000..f81cad38897
--- /dev/null
+++ b/math/R/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.3 2002/12/10 11:58:14 markd Exp $
+
+--- src/library/lqs/Makefile.in.orig Mon Jul 22 00:32:06 2002
++++ src/library/lqs/Makefile.in Tue Dec 10 00:00:27 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ai b/math/R/patches/patch-ai
new file mode 100644
index 00000000000..7e1c945aee2
--- /dev/null
+++ b/math/R/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2002/12/10 11:58:14 markd Exp $
+
+--- src/library/methods/Makefile.in.orig Mon Jul 22 00:32:06 2002
++++ src/library/methods/Makefile.in Tue Dec 10 00:00:58 2002
+@@ -28,10 +28,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-aj b/math/R/patches/patch-aj
new file mode 100644
index 00000000000..7a0688794a3
--- /dev/null
+++ b/math/R/patches/patch-aj
@@ -0,0 +1,17 @@
+$NetBSD: patch-aj,v 1.1 2002/12/10 11:58:15 markd Exp $
+
+--- src/library/modreg/Makefile.in.orig Sun Jul 21 04:48:01 2002
++++ src/library/modreg/Makefile.in Tue Dec 10 00:01:41 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ak b/math/R/patches/patch-ak
new file mode 100644
index 00000000000..5a26dfd676a
--- /dev/null
+++ b/math/R/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2002/12/10 11:58:16 markd Exp $
+
+--- src/library/mva/Makefile.in.orig Mon Jul 22 00:32:07 2002
++++ src/library/mva/Makefile.in Tue Dec 10 00:02:10 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-al b/math/R/patches/patch-al
new file mode 100644
index 00000000000..56d352e4bad
--- /dev/null
+++ b/math/R/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2002/12/10 11:58:16 markd Exp $
+
+--- src/library/nls/Makefile.in.orig Mon Jul 22 00:32:07 2002
++++ src/library/nls/Makefile.in Tue Dec 10 00:03:59 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-am b/math/R/patches/patch-am
new file mode 100644
index 00000000000..ee731d61b15
--- /dev/null
+++ b/math/R/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1 2002/12/10 11:58:16 markd Exp $
+
+--- src/library/splines/Makefile.in.orig Mon Jul 22 00:32:07 2002
++++ src/library/splines/Makefile.in Tue Dec 10 00:04:36 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-an b/math/R/patches/patch-an
new file mode 100644
index 00000000000..24917449fc5
--- /dev/null
+++ b/math/R/patches/patch-an
@@ -0,0 +1,17 @@
+$NetBSD: patch-an,v 1.1 2002/12/10 11:58:17 markd Exp $
+
+--- src/library/stepfun/Makefile.in.orig Mon Jul 22 00:32:08 2002
++++ src/library/stepfun/Makefile.in Tue Dec 10 00:05:01 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ao b/math/R/patches/patch-ao
new file mode 100644
index 00000000000..a58540132d9
--- /dev/null
+++ b/math/R/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2002/12/10 11:58:17 markd Exp $
+
+--- src/library/tcltk/Makefile.in.orig Mon Jul 22 00:32:08 2002
++++ src/library/tcltk/Makefile.in Tue Dec 10 00:05:43 2002
+@@ -31,10 +31,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ap b/math/R/patches/patch-ap
new file mode 100644
index 00000000000..985a53756c1
--- /dev/null
+++ b/math/R/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1 2002/12/10 11:58:17 markd Exp $
+
+--- src/library/tools/Makefile.in.orig Fri Oct 11 20:42:12 2002
++++ src/library/tools/Makefile.in Tue Dec 10 00:06:10 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-aq b/math/R/patches/patch-aq
new file mode 100644
index 00000000000..0fe1f2a05a4
--- /dev/null
+++ b/math/R/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.1 2002/12/10 11:58:18 markd Exp $
+
+--- src/library/ts/Makefile.in.orig Mon Jul 22 00:32:09 2002
++++ src/library/ts/Makefile.in Tue Dec 10 00:06:38 2002
+@@ -29,10 +29,10 @@
+ fi; \
+ done
+ @if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
++ echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
++ $(top_builddir)/$(subdir)/DESCRIPTION; \
+ $(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
+ $(top_builddir)/library/$(pkg); \
+- echo "Built: R" @VERSION@\; @R_PLATFORM@\; `date` >> \
+- $(top_builddir)/library/$(pkg)/DESCRIPTION; \
+ fi
+ @if test -d $(srcdir)/data; then \
+ $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \