Update R to 1.8.1.

Changes since 1.6.2 Many new features. Language changes. Additional standard package 'mle'. Some old features deprecated or defunct. Many many bug fixes. Update to 1.8.0 from Ray Brownrigg in private communication, cleaned up and updated to 1.8.1 by me.
author: markd <markd> 2003-12-03 12:05:18 +0000
committer: markd <markd> 2003-12-03 12:05:18 +0000
commit: 7ff8440a38d01b0bc01a8f5ea4b97bf42a61a36f (patch)
tree: 223902c23ea4e35e7938e98a02d6b6576a089c66 /math/R
parent: 39bf407adce75afb28e768f771cbad87be382740 (diff)
download: pkgsrc-7ff8440a38d01b0bc01a8f5ea4b97bf42a61a36f.tar.gz
22 files changed, 320 insertions, 369 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 0ab5317366b..6b937f25a20 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2003/07/17 21:47:15 grant Exp $
+# $NetBSD: Makefile,v 1.45 2003/12/03 12:05:18 markd Exp $
 
-DISTNAME=		R-1.6.2
+DISTNAME=		R-1.8.1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/}
 EXTRACT_SUFX=		.tgz
@@ -13,11 +13,14 @@ COMMENT=		Statistical language for data analysis and graphics
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 			NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
 
+TEST_TARGET=		check
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_PERL5=		# defined
 USE_GMAKE=		# defined
 USE_GNU_READLINE=	# uses callback interface
+USE_MAKEINFO=		# defined
+TEXINFO_REQD=		4.0
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-R-shlib
@@ -110,6 +113,7 @@ post-install:
 	${ECHO} "@exec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null" >> ${PLIST_SRC}
 	${ECHO} "@exec ${CAT} %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null" >> ${PLIST_SRC}
 
+.include "../../devel/pcre/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index 638946f8452..00dad0467ad 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.4 2003/03/29 12:41:38 jmmv Exp $
+# $NetBSD: Makefile.extension,v 1.5 2003/12/03 12:05:18 markd Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -15,7 +15,7 @@ MASTER_SITES?=		${MASTER_SITE_R_CRAN:=contrib/}
 DIST_SUBDIR?=		R
 CATEGORIES+=		math
 
-R_DEPENDS?=		R>=1.4.1nb2
+R_DEPENDS?=		R>=1.7.0
 DEPENDS+=               ${R_DEPENDS}:../../math/R
 
 NO_BUILD=		YES
diff --git a/math/R/buildlink2.mk b/math/R/buildlink2.mk
index fa8f4776982..63c0b50fd43 100644
--- a/math/R/buildlink2.mk
+++ b/math/R/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/14 19:37:48 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 12:05:18 markd Exp $
 #
 # This Makefile fragment is included by packages that use the R shared library.
 #
@@ -7,7 +7,7 @@
 R_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		R
-BUILDLINK_DEPENDS.R?=		R>=1.6.1
+BUILDLINK_DEPENDS.R?=		R>=1.7.0
 BUILDLINK_PKGSRCDIR.R?=		../../math/R
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.R=R
diff --git a/math/R/distinfo b/math/R/distinfo
index 6ad99cb4d06..96b039cac59 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.12 2003/01/23 21:24:58 markd Exp $
+$NetBSD: distinfo,v 1.13 2003/12/03 12:05:18 markd Exp $
 
-SHA1 (R-1.6.2.tgz) = bc7527d856e7a1d1dcbb2bfc71606d6bb9111bcd
-Size (R-1.6.2.tgz) = 8659106 bytes
-SHA1 (patch-aa) = 8ec7504d5c08e4258b0b1a433aed8760f630089e
-SHA1 (patch-ab) = a3bd4d27abbc7f26e223aaa1e559ccfc0e363c39
-SHA1 (patch-ac) = 438bd084536b4f0d2a5ba9eef67f57e0311d7d76
-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
+SHA1 (R-1.8.1.tgz) = 397511dcef3a04ebb67ef23988f5c32eee72fe95
+Size (R-1.8.1.tgz) = 9407628 bytes
+SHA1 (patch-aa) = c81131e2a8601ff061502e72a9f322d955dfe72c
+SHA1 (patch-ab) = 192044af2d9cd73f19e8324384cab91635e27067
+SHA1 (patch-ac) = 83f261aa8a538ad013505582c821c459d4628f08
+SHA1 (patch-ad) = 69706964d6bc13e40ade009cbf1bb61d80d4fb36
+SHA1 (patch-ae) = 917fe5d509bcef59e18215c4a4ad3662694fca37
+SHA1 (patch-af) = da90dd523784806ffc71617760c71b4dbf0dfbe3
+SHA1 (patch-ag) = 108795b4e679aa5149df1dcb3d3b7cf40c5b3f86
+SHA1 (patch-ah) = b986ada9088875748361dc1750812e53d1900260
+SHA1 (patch-ai) = 2f7fc15dcc08659dfb6c2fef097af7f86bb17e67
+SHA1 (patch-aj) = b23b6f4d113cf2a49881bff6c34b0408c961499c
+SHA1 (patch-ak) = 5927f451f05674d431687c93dca4c452e59889da
+SHA1 (patch-al) = 9081ae2e771fcede31b085097f41334030d36ebe
+SHA1 (patch-am) = 47c47fdc12e7c771eb29c066575c666eaec96870
+SHA1 (patch-an) = e45ce6861ec7e35e02faf46c95863803783f2bda
+SHA1 (patch-ao) = c99629da4329e67d1adbb48cd89a50531743d63f
+SHA1 (patch-ap) = b75680bae0d75f417c74d2137ba4b43ec1428131
+SHA1 (patch-aq) = 512d7613bbba00c0cb3e4543812f734159e12a92
+SHA1 (patch-ar) = 5cc4a77c253a77a564433187babb0135ccb84eaf
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index 44190684f16..60370a823c7 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2002/12/10 11:58:11 markd Exp $
+$NetBSD: patch-aa,v 1.11 2003/12/03 12:05:18 markd Exp $
 
---- configure.ac.orig	Mon Oct 21 22:27:50 2002
+--- configure.ac.orig	2003-09-17 11:01:04.000000000 +1200
 +++ configure.ac
-@@ -148,7 +148,7 @@
+@@ -134,7 +134,7 @@ AC_ARG_ENABLE([R-shlib],
  [want_R_shlib=no])
  AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes])
  if test "${want_R_shlib}" = yes; then
@@ -11,34 +11,21 @@ $NetBSD: patch-aa,v 1.10 2002/12/10 11:58:11 markd Exp $
  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)
--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)
- 
- ## Readline.
-@@ -555,13 +555,6 @@ case "${host_cpu}" in
+@@ -592,13 +592,6 @@ case "${host_cpu}" in
        R_PROG_CC_FLAG([-ieee_with_inexact],
-                      [R_XTRA_CFLAGS="${R_XTRA_CFLAGS} -ieee_with_inexact"])
+                      R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
      fi
 -    if test "${G77}" = yes; then
 -      R_PROG_F77_FLAG([-mieee],
--                      [R_XTRA_FFLAGS="${R_XTRA_FFLAGS} -mieee"])
+-                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-mieee]))
 -    else
 -      R_PROG_F77_FLAG([-fpe3],
--                      [R_XTRA_FFLAGS="${R_XTRA_FFLAGS} -fpe3"])
+-                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-fpe3]))
 -    fi
      if test "${GXX}" = yes; then
        R_PROG_CXX_FLAG([-mieee],
-                       [R_XTRA_CXXFLAGS="${R_XTRA_CXXFLAGS} -mieee"])
-@@ -821,6 +814,7 @@ case "${host_os}" in
+                       R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
+@@ -891,6 +884,7 @@ case "${host_os}" in
      fpicflags=
      ;;
    netbsd*)
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index 568d1c61fcf..c493267b4fe 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.14 2002/12/10 11:58:11 markd Exp $
+$NetBSD: patch-ab,v 1.15 2003/12/03 12:05:18 markd Exp $
 
---- aclocal.m4.orig	Mon Oct 21 22:28:00 2002
+--- aclocal.m4.orig	2003-09-27 18:08:39.000000000 +1200
 +++ aclocal.m4
-@@ -522,6 +522,9 @@
+@@ -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);
  
@@ -12,13 +20,13 @@ $NetBSD: patch-ab,v 1.14 2002/12/10 11:58:11 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];
-@@ -602,6 +605,9 @@
- } Rcomplex;
+@@ -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 --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 1784833afc9..adfdfeb566c 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
+$NetBSD: patch-ac,v 1.10 2003/12/03 12:05:18 markd Exp $
 
---- configure.orig	Sat Jan 11 03:52:06 2003
+--- configure.orig	2003-10-08 22:59:51.000000000 +1300
 +++ configure
-@@ -2095,7 +2095,7 @@
+@@ -2108,7 +2108,7 @@ else
    WANT_R_SHLIB_FALSE=
  fi
  if test "${want_R_shlib}" = yes; then
@@ -11,149 +11,15 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
  else
    LIBR=
  fi
-@@ -11123,13 +11123,13 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for main in -lncurses" >&5
--echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
--if test "${ac_cv_lib_ncurses_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
-+echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncurses  $LIBS"
-+LIBS="-ltermcap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -11159,34 +11159,34 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_ncurses_main=yes
-+  ac_cv_lib_termcap_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ncurses_main=no
-+ac_cv_lib_termcap_main=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
--echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
--if test $ac_cv_lib_ncurses_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6
-+if test $ac_cv_lib_termcap_main = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBNCURSES 1
-+#define HAVE_LIBTERMCAP 1
- _ACEOF
- 
--  LIBS="-lncurses $LIBS"
-+  LIBS="-ltermcap $LIBS"
- 
- else
- 
--echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
--echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6
--if test "${ac_cv_lib_termcap_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
-+echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6
-+if test "${ac_cv_lib_termlib_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
-+LIBS="-ltermlib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -11216,34 +11216,34 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_termcap_main=yes
-+  ac_cv_lib_termlib_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_termcap_main=no
-+ac_cv_lib_termlib_main=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6
--if test $ac_cv_lib_termcap_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6
-+if test $ac_cv_lib_termlib_main = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBTERMCAP 1
-+#define HAVE_LIBTERMLIB 1
- _ACEOF
- 
--  LIBS="-ltermcap $LIBS"
-+  LIBS="-ltermlib $LIBS"
- 
- else
- 
--echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
--echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6
--if test "${ac_cv_lib_termlib_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -lncurses" >&5
-+echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
-+if test "${ac_cv_lib_ncurses_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermlib  $LIBS"
-+LIBS="-lncurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -11273,24 +11273,24 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_termlib_main=yes
-+  ac_cv_lib_ncurses_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_termlib_main=no
-+ac_cv_lib_ncurses_main=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
--echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6
--if test $ac_cv_lib_termlib_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
-+if test $ac_cv_lib_ncurses_main = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBTERMLIB 1
-+#define HAVE_LIBNCURSES 1
- _ACEOF
- 
--  LIBS="-ltermlib $LIBS"
-+  LIBS="-lncurses $LIBS"
- 
- fi
- 
-@@ -15432,6 +15432,9 @@
+@@ -15834,6 +15834,7 @@ cat > conftest.c <<EOF
+ #else
+ # define F77_SYMBOL(x)   x
+ #endif
++int MAIN__ () { return 0; }
+ int main () {
+   exit(0);
+ }
+@@ -15902,6 +15903,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -163,7 +29,7 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 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];
-@@ -15520,6 +15523,9 @@
+@@ -15990,6 +15994,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -173,12 +39,12 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -16510,123 +16516,6 @@
+@@ -17020,135 +17027,6 @@ echo "${ECHO_T}no" >&6
  fi
  
      fi
 -    if test "${G77}" = yes; then
--      ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
+-      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 eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
@@ -229,14 +95,20 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
 -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
--  R_XTRA_FFLAGS="${R_XTRA_FFLAGS} -mieee"
+-  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=`echo "-fpe3" | sed 'y%./+-:=%__p___%'`
+-      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 eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
@@ -287,7 +159,13 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
 -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
--  R_XTRA_FFLAGS="${R_XTRA_FFLAGS} -fpe3"
+-  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
@@ -295,9 +173,9 @@ $NetBSD: patch-ac,v 1.9 2003/01/23 21:24:58 markd Exp $
 -
 -    fi
      if test "${GXX}" = yes; then
-       ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
+       ac_safe=_mieee
  echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -17397,6 +17286,7 @@
+@@ -18017,6 +17895,7 @@ fi ;;
      fpicflags=
      ;;
    netbsd*)
diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad
index 98618dcedd0..4f7d72d3f4b 100644
--- a/math/R/patches/patch-ad
+++ b/math/R/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.5 2002/12/10 11:58:12 markd Exp $
+$NetBSD: patch-ad,v 1.6 2003/12/03 12:05:19 markd Exp $
 
---- src/scripts/SHLIB.in.orig	Wed Jul 17 19:36:11 2002
+--- src/scripts/SHLIB.in.orig	2003-04-04 05:31:58.000000000 +1200
 +++ src/scripts/SHLIB.in
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ if ${with_f77}; then
  fi
  
- if test -f ${R_HOME}/bin/libR@SHLIB_EXT@; then
+ if test -f ${R_HOME}/bin/libR@DYLIB_EXT@; then
 -  LIBR="-L${R_HOME}/bin -lR"
 +  LIBR="-Wl,-R@prefix@/lib/R/bin -L${R_HOME}/bin -lR"
  else
diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae
index 386b5d2c591..80055f7669a 100644
--- a/math/R/patches/patch-ae
+++ b/math/R/patches/patch-ae
@@ -1,17 +1,21 @@
-$NetBSD: patch-ae,v 1.6 2002/12/10 11:58:12 markd Exp $
+$NetBSD: patch-ae,v 1.7 2003/12/03 12:05:19 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; \
+--- src/library/base/Makefile.in.orig	2003-09-21 20:13:04.000000000 +1200
++++ src/library/base/Makefile.in
+@@ -33,14 +33,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 3279e85b5fa..cdfde36e262 100644
--- a/math/R/patches/patch-af
+++ b/math/R/patches/patch-af
@@ -1,17 +1,21 @@
-$NetBSD: patch-af,v 1.5 2002/12/10 11:58:12 markd Exp $
+$NetBSD: patch-af,v 1.6 2003/12/03 12:05:19 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; \
+--- src/library/ctest/Makefile.in.orig	2003-09-21 20:13:04.000000000 +1200
++++ src/library/ctest/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 6f18d1c40e8..9949f9d829a 100644
--- a/math/R/patches/patch-ag
+++ b/math/R/patches/patch-ag
@@ -1,17 +1,21 @@
-$NetBSD: patch-ag,v 1.5 2002/12/10 11:58:13 markd Exp $
+$NetBSD: patch-ag,v 1.6 2003/12/03 12:05:19 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; \
+--- src/library/eda/Makefile.in.orig	2003-09-21 20:13:05.000000000 +1200
++++ src/library/eda/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index f81cad38897..057eb67ed01 100644
--- a/math/R/patches/patch-ah
+++ b/math/R/patches/patch-ah
@@ -1,17 +1,21 @@
-$NetBSD: patch-ah,v 1.3 2002/12/10 11:58:14 markd Exp $
+$NetBSD: patch-ah,v 1.4 2003/12/03 12:05:19 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; \
+--- src/library/lqs/Makefile.in.orig	2003-09-21 20:13:05.000000000 +1200
++++ src/library/lqs/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 7e1c945aee2..aad55070438 100644
--- a/math/R/patches/patch-ai
+++ b/math/R/patches/patch-ai
@@ -1,17 +1,21 @@
-$NetBSD: patch-ai,v 1.1 2002/12/10 11:58:14 markd Exp $
+$NetBSD: patch-ai,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/methods/Makefile.in.orig	2003-09-24 08:56:51.000000000 +1200
++++ src/library/methods/Makefile.in
+@@ -28,14 +28,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 7a0688794a3..e5b241be1f0 100644
--- a/math/R/patches/patch-aj
+++ b/math/R/patches/patch-aj
@@ -1,17 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2002/12/10 11:58:15 markd Exp $
+$NetBSD: patch-aj,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/modreg/Makefile.in.orig	2003-09-21 20:13:06.000000000 +1200
++++ src/library/modreg/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 5a26dfd676a..22bdc423e86 100644
--- a/math/R/patches/patch-ak
+++ b/math/R/patches/patch-ak
@@ -1,17 +1,21 @@
-$NetBSD: patch-ak,v 1.1 2002/12/10 11:58:16 markd Exp $
+$NetBSD: patch-ak,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/mva/Makefile.in.orig	2003-09-21 20:13:06.000000000 +1200
++++ src/library/mva/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 56d352e4bad..de1c8159017 100644
--- a/math/R/patches/patch-al
+++ b/math/R/patches/patch-al
@@ -1,17 +1,21 @@
-$NetBSD: patch-al,v 1.1 2002/12/10 11:58:16 markd Exp $
+$NetBSD: patch-al,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/nls/Makefile.in.orig	2003-09-21 20:13:07.000000000 +1200
++++ src/library/nls/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index ee731d61b15..40d2ecc66f3 100644
--- a/math/R/patches/patch-am
+++ b/math/R/patches/patch-am
@@ -1,17 +1,21 @@
-$NetBSD: patch-am,v 1.1 2002/12/10 11:58:16 markd Exp $
+$NetBSD: patch-am,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/splines/Makefile.in.orig	2003-09-21 20:13:07.000000000 +1200
++++ src/library/splines/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 24917449fc5..21c7f31da39 100644
--- a/math/R/patches/patch-an
+++ b/math/R/patches/patch-an
@@ -1,17 +1,21 @@
-$NetBSD: patch-an,v 1.1 2002/12/10 11:58:17 markd Exp $
+$NetBSD: patch-an,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/stepfun/Makefile.in.orig	2003-09-21 20:13:08.000000000 +1200
++++ src/library/stepfun/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index a58540132d9..0aee3b5e13f 100644
--- a/math/R/patches/patch-ao
+++ b/math/R/patches/patch-ao
@@ -1,17 +1,21 @@
-$NetBSD: patch-ao,v 1.1 2002/12/10 11:58:17 markd Exp $
+$NetBSD: patch-ao,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/tcltk/Makefile.in.orig	2003-09-21 20:13:08.000000000 +1200
++++ src/library/tcltk/Makefile.in
+@@ -37,14 +37,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 985a53756c1..9f50fe21140 100644
--- a/math/R/patches/patch-ap
+++ b/math/R/patches/patch-ap
@@ -1,17 +1,21 @@
-$NetBSD: patch-ap,v 1.1 2002/12/10 11:58:17 markd Exp $
+$NetBSD: patch-ap,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/tools/Makefile.in.orig	2003-09-21 20:13:09.000000000 +1200
++++ src/library/tools/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	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
index 0fe1f2a05a4..81a1ac2d514 100644
--- a/math/R/patches/patch-aq
+++ b/math/R/patches/patch-aq
@@ -1,17 +1,21 @@
-$NetBSD: patch-aq,v 1.1 2002/12/10 11:58:18 markd Exp $
+$NetBSD: patch-aq,v 1.2 2003/12/03 12:05:19 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; \
+--- src/library/ts/Makefile.in.orig	2003-09-21 20:13:09.000000000 +1200
++++ src/library/ts/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  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; \
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
  	fi
  	@if test -d $(srcdir)/data; then \
  	  $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff --git a/math/R/patches/patch-ar b/math/R/patches/patch-ar
new file mode 100644
index 00000000000..77e997249f3
--- /dev/null
+++ b/math/R/patches/patch-ar
@@ -0,0 +1,21 @@
+$NetBSD: patch-ar,v 1.1 2003/12/03 12:05:19 markd Exp $
+
+--- src/library/grid/Makefile.in.orig	2003-09-21 20:13:09.000000000 +1200
++++ src/library/grid/Makefile.in
+@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
+ 	  fi; \
+ 	done
+ 	@if test -f DESCRIPTION; then \
+-	  $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	  (tmp="Built: R $(VERSION); "; \
+ 	    if test -d $(srcdir)/src; then \
+ 	      tmp="$${tmp}$(R_PLATFORM)"; \
+ 	    fi; \
+ 	    tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
+ 	    echo "$${tmp}") \
+-	    >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
++	    >> DESCRIPTION; \
++	    $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
+ 	fi
+ 	@if test -d $(srcdir)/data; then \
+ 	  $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
author	markd <markd>	2003-12-03 12:05:18 +0000
committer	markd <markd>	2003-12-03 12:05:18 +0000
commit	7ff8440a38d01b0bc01a8f5ea4b97bf42a61a36f (patch)
tree	223902c23ea4e35e7938e98a02d6b6576a089c66 /math/R
parent	39bf407adce75afb28e768f771cbad87be382740 (diff)
download	pkgsrc-7ff8440a38d01b0bc01a8f5ea4b97bf42a61a36f.tar.gz