From ab70b1ee3a64a6b8afc3d6f25c4a57dd1e0bcfda Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 25 May 1999 23:45:05 +0000
Subject: Updated R to 0.64.1.  Too many changes from 0.62.1 to enumerate. See
 NEWS file in distribution.

---
 math/R/patches/patch-aa | 16 ++++++++++++----
 math/R/patches/patch-ab | 45 +++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 20 deletions(-)

(limited to 'math/R/patches')

diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index a6633cad848..431c0bfa1bb 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1 1998/12/21 10:29:40 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 1999/05/25 23:45:06 jlam Exp $
 
---- Makeconf.in.orig	Mon Nov 23 04:20:11 1998
-+++ Makeconf.in	Sun Dec 20 12:12:22 1998
-@@ -50,4 +50,4 @@
+--- Makeconf.in.orig	Tue Feb  2 19:16:51 1999
++++ Makeconf.in	Tue May 25 02:52:48 1999
+@@ -20,6 +20,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DIR = ${INSTALL} -d
+ LATEX = @LATEX@
+ LDCMD = @LDCMD@
+@@ -53,4 +54,4 @@
  libdir = @libdir@
  mandir = @mandir@
  
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index 02ce15a7cef..a6ff02626f6 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,19 +1,32 @@
-$NetBSD: patch-ab,v 1.1 1998/12/21 10:29:41 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 1999/05/25 23:45:06 jlam Exp $
 
---- configure.orig	Fri Dec  4 08:06:25 1998
-+++ configure	Sun Dec 20 09:54:23 1998
-@@ -3290,6 +3290,14 @@
-   *linux)
-     DLLFLAGS=-export-dynamic
+--- configure.orig	Fri May  7 06:25:40 1999
++++ configure	Tue May 25 03:01:46 1999
+@@ -812,6 +812,7 @@
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
+ 
+ ## Fix a bug in autoconf---the path of the install shell script is
+ ## not cached.  Could also use an absolute path in AC_CONFIG_AUX_DIR().
+@@ -3619,9 +3620,10 @@
      ;;
-+  *netbsd*)
-+    if ${CPP} - -dM </dev/null | grep -q __ELF__; then
-+      DLLFLAGS="-export-dynamic"
-+      SHLIBLDFLAGS="-shared"
-+    else
-+      SHLIBLDFLAGS="-Bshareable"
-+    fi
-+    ;;
-   *sgi*)
-     SHLIBLDFLAGS="-shared"
+   *netbsd*)
+     if ${CPP} - -dM < /dev/null | grep -q __ELF__; then
+-      DLLFLAGS="-export-dynamic"
++      DLLFLAGS="${LDFLAGS} -export-dynamic"
+       SHLIBLDFLAGS="-shared"
+     else
++      DLLFLAGS="${LDFLAGS}"
+       SHLIBLDFLAGS="-Bshareable"
+     fi
      ;;
+@@ -4746,6 +4748,7 @@
+ s%@config_opts@%$config_opts%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@LN_S@%$LN_S%g
+ s%@RANLIB@%$RANLIB%g
+ s%@YACC@%$YACC%g
-- 
cgit v1.2.3