Update R to 0.63.1, provided in pr 6618 by Johnny C. Lam.

Changes since 0.63.0 are mostly bigfixes and patches that make it
actually work properly with NetBSD.

7 files changed, 107 insertions, 17 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 9c0e89881ab..6c99b71a31a 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/04 11:36:03 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/21 10:29:39 frueauf Exp $
 #
 
-DISTNAME=	R-0.63.0
-WRKSRC=		${WRKDIR}/R-0.63
+DISTNAME=	R-0.63.1
 CATEGORIES=	math
 MASTER_SITES=	http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 		ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -19,13 +18,13 @@ MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://lib.stat.cmu.edu/R/CRAN/
 
 .if !exists(/usr/bin/f77)
-BUILD_DEPENDS+=	f2c-19980516p1:../../lang/f2c
+DEPENDS+=	f2c:../../lang/f2c
 .endif
 DEPENDS+=	readline-2.2:../../devel/readline
 
-USE_PERL5=	yes
-USE_GMAKE=	yes
+CONFLICTS=	R-0.63.0
 
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-readline --with-x
 
@@ -40,13 +39,11 @@ R_PAPERSIZE=	Letter
 .endif
 .endif
 
-CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		DLLFLAGS="${LDFLAGS}" \
-		R_PAPERSIZE=${R_PAPERSIZE}
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		R_PAPERSIZE="${R_PAPERSIZE}"
 
-post-build:
-	${TOUCH} ${WRKSRC}/library/modreg/data/.keep_me
+post-install:
+	${RMDIR} ${PREFIX}/share/R/library/modreg/data
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R/files/md5 b/math/R/files/md5
index 270d6a5e40c..0776e092451 100644
--- a/math/R/files/md5
+++ b/math/R/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/12/04 11:36:03 frueauf Exp $
+$NetBSD: md5,v 1.2 1998/12/21 10:29:40 frueauf Exp $
 
-MD5 (R-0.63.0.tgz) = 653906d111252bb3600e18b5bea0a1d1
+MD5 (R-0.63.1.tgz) = 24cc595468a2584328ae30ade1b8e11e
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
new file mode 100644
index 00000000000..a6633cad848
--- /dev/null
+++ b/math/R/patches/patch-aa
@@ -0,0 +1,10 @@
+$NetBSD: patch-aa,v 1.1 1998/12/21 10:29:40 frueauf Exp $
+
+--- Makeconf.in.orig	Mon Nov 23 04:20:11 1998
++++ Makeconf.in	Sun Dec 20 12:12:22 1998
+@@ -50,4 +50,4 @@
+ libdir = @libdir@
+ mandir = @mandir@
+ 
+-rhome = @libdir@/R
++rhome = @datadir@/R
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
new file mode 100644
index 00000000000..02ce15a7cef
--- /dev/null
+++ b/math/R/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 1998/12/21 10:29:41 frueauf 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
+     ;;
++  *netbsd*)
++    if ${CPP} - -dM </dev/null | grep -q __ELF__; then
++      DLLFLAGS="-export-dynamic"
++      SHLIBLDFLAGS="-shared"
++    else
++      SHLIBLDFLAGS="-Bshareable"
++    fi
++    ;;
+   *sgi*)
+     SHLIBLDFLAGS="-shared"
+     ;;
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
new file mode 100644
index 00000000000..c65257517a6
--- /dev/null
+++ b/math/R/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1998/12/21 10:29:41 frueauf Exp $
+
+--- src/main/Makefile.in.orig	Wed Nov 25 12:54:51 1998
++++ src/main/Makefile.in	Sun Dec 20 09:53:29 1998
+@@ -34,7 +34,7 @@
+ 
+ $(top_builddir)/bin/R.binary: $(OBJS) $(RLIBS)
+ 	@$(MKINSTALLDIRS) $(top_builddir)/bin
+-	$(LDCMD) $(DLLFLAGS) -o $@ $(OBJS) $(ALL_LIBS)
++	$(LDCMD) $(DLLFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(ALL_LIBS)
+ 
+ ../unix/libunix.a:
+ 	(cd ../unix;  $(MAKE) $(@F))
diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad
new file mode 100644
index 00000000000..2cd041023d5
--- /dev/null
+++ b/math/R/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 1998/12/21 10:29:41 frueauf Exp $
+
+--- src/library/eda/src/Makefile.in.orig	Tue Oct 13 04:04:28 1998
++++ src/library/eda/src/Makefile.in	Sun Dec 20 11:16:36 1998
+@@ -18,7 +18,7 @@
+ 
+ all: $(LIB)
+ 	@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/libs
+-	@cp $< $(top_builddir)/library/$(pkg)/libs
++	@cp $(LIB) $(top_builddir)/library/$(pkg)/libs
+ 
+ $(LIB): $(OBJS)
+ 	$(SHLIBLD) $(SHLIBLDFLAGS) -o $@ $(OBJS)
+--- src/library/modreg/src/Makefile.in.orig	Tue Nov 10 03:07:44 1998
++++ src/library/modreg/src/Makefile.in	Sun Dec 20 11:17:28 1998
+@@ -19,7 +19,7 @@
+ 
+ all: $(LIB)
+ 	@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/libs
+-	@cp $< $(top_builddir)/library/$(pkg)/libs
++	@cp $(LIB) $(top_builddir)/library/$(pkg)/libs
+ 
+ $(LIB): $(OBJS)
+ 	$(top_builddir)/bin/R SHLIB -o $@ $(OBJS)
+--- src/library/mva/src/Makefile.in.orig	Tue Oct 13 04:04:28 1998
++++ src/library/mva/src/Makefile.in	Sun Dec 20 11:18:09 1998
+@@ -19,7 +19,7 @@
+ 
+ all: $(LIB)
+ 	@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/libs
+-	@cp $< $(top_builddir)/library/$(pkg)/libs
++	@cp $(LIB) $(top_builddir)/library/$(pkg)/libs
+ 
+ $(LIB): $(OBJS)
+ 	$(SHLIBLD) $(SHLIBLDFLAGS) -o $@ $(OBJS)
diff --git a/math/R/pkg/PLIST b/math/R/pkg/PLIST
index 3bb285e3b99..7f2c6e26b3e 100644
--- a/math/R/pkg/PLIST
+++ b/math/R/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/04 11:36:03 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/12/21 10:29:42 frueauf Exp $
 bin/R
 bin/Rd2txt
 bin/Rdconv
@@ -109,6 +109,7 @@ share/R/doc/keyword-test
 share/R/doc/manual/ABOUT.tex
 share/R/doc/manual/Man.tex
 share/R/doc/manual/Rd.sty
+share/R/doc/manual/Rd2dvi.tex
 share/R/doc/manual/plotmath.tex
 share/R/doc/manual/primitive-funs.tex
 share/R/doc/manual/writing-Rd.tex
@@ -128,6 +129,7 @@ share/R/include/Mathlib.h
 share/R/include/Memory.h
 share/R/include/Platform.h
 share/R/include/PrtUtil.h
+share/R/include/Random.h
 share/R/include/S.h
 share/R/include/S_compat.h
 share/R/include/Utils.h
@@ -168,6 +170,7 @@ share/R/library/base/R-ex/Logistic.R
 share/R/library/base/R-ex/Lognormal.R
 share/R/library/base/R-ex/Machine.R
 share/R/library/base/R-ex/Math.R
+share/R/library/base/R-ex/Memory.R
 share/R/library/base/R-ex/NA.R
 share/R/library/base/R-ex/NChisquare.R
 share/R/library/base/R-ex/NULL.R
@@ -227,6 +230,7 @@ share/R/library/base/R-ex/box.R
 share/R/library/base/R-ex/boxplot.R
 share/R/library/base/R-ex/boxplot.stats.R
 share/R/library/base/R-ex/browser.R
+share/R/library/base/R-ex/bug.report.R
 share/R/library/base/R-ex/bxp.R
 share/R/library/base/R-ex/c.R
 share/R/library/base/R-ex/call.R
@@ -404,6 +408,7 @@ share/R/library/base/R-ex/model.extract.R
 share/R/library/base/R-ex/model.frame.R
 share/R/library/base/R-ex/model.matrix.R
 share/R/library/base/R-ex/model.tables.R
+share/R/library/base/R-ex/mosaicplot.R
 share/R/library/base/R-ex/mtext.R
 share/R/library/base/R-ex/na.action.R
 share/R/library/base/R-ex/na.fail.R
@@ -487,6 +492,7 @@ share/R/library/base/R-ex/rev.R
 share/R/library/base/R-ex/rgb.R
 share/R/library/base/R-ex/rivers.R
 share/R/library/base/R-ex/row.R
+share/R/library/base/R-ex/rowsum.R
 share/R/library/base/R-ex/rug.R
 share/R/library/base/R-ex/sample.R
 share/R/library/base/R-ex/save.R
@@ -656,6 +662,7 @@ share/R/library/base/help/Logistic
 share/R/library/base/help/Lognormal
 share/R/library/base/help/Machine
 share/R/library/base/help/Math
+share/R/library/base/help/Memory
 share/R/library/base/help/NA
 share/R/library/base/help/NChisquare
 share/R/library/base/help/NULL
@@ -715,6 +722,7 @@ share/R/library/base/help/box
 share/R/library/base/help/boxplot
 share/R/library/base/help/boxplot.stats
 share/R/library/base/help/browser
+share/R/library/base/help/bug.report
 share/R/library/base/help/bxp
 share/R/library/base/help/c
 share/R/library/base/help/call
@@ -892,6 +900,7 @@ share/R/library/base/help/model.extract
 share/R/library/base/help/model.frame
 share/R/library/base/help/model.matrix
 share/R/library/base/help/model.tables
+share/R/library/base/help/mosaicplot
 share/R/library/base/help/mtext
 share/R/library/base/help/na.action
 share/R/library/base/help/na.fail
@@ -975,6 +984,7 @@ share/R/library/base/help/rev
 share/R/library/base/help/rgb
 share/R/library/base/help/rivers
 share/R/library/base/help/row
+share/R/library/base/help/rowsum
 share/R/library/base/help/rug
 share/R/library/base/help/sample
 share/R/library/base/help/save
@@ -1092,6 +1102,7 @@ share/R/library/base/html/Logistic.html
 share/R/library/base/html/Lognormal.html
 share/R/library/base/html/Machine.html
 share/R/library/base/html/Math.html
+share/R/library/base/html/Memory.html
 share/R/library/base/html/NA.html
 share/R/library/base/html/NChisquare.html
 share/R/library/base/html/NULL.html
@@ -1151,6 +1162,7 @@ share/R/library/base/html/box.html
 share/R/library/base/html/boxplot.html
 share/R/library/base/html/boxplot.stats.html
 share/R/library/base/html/browser.html
+share/R/library/base/html/bug.report.html
 share/R/library/base/html/bxp.html
 share/R/library/base/html/c.html
 share/R/library/base/html/call.html
@@ -1328,6 +1340,7 @@ share/R/library/base/html/model.extract.html
 share/R/library/base/html/model.frame.html
 share/R/library/base/html/model.matrix.html
 share/R/library/base/html/model.tables.html
+share/R/library/base/html/mosaicplot.html
 share/R/library/base/html/mtext.html
 share/R/library/base/html/na.action.html
 share/R/library/base/html/na.fail.html
@@ -1411,6 +1424,7 @@ share/R/library/base/html/rev.html
 share/R/library/base/html/rgb.html
 share/R/library/base/html/rivers.html
 share/R/library/base/html/row.html
+share/R/library/base/html/rowsum.html
 share/R/library/base/html/rug.html
 share/R/library/base/html/sample.html
 share/R/library/base/html/save.html
@@ -1527,6 +1541,7 @@ share/R/library/base/latex/Logistic.tex
 share/R/library/base/latex/Lognormal.tex
 share/R/library/base/latex/Machine.tex
 share/R/library/base/latex/Math.tex
+share/R/library/base/latex/Memory.tex
 share/R/library/base/latex/NA.tex
 share/R/library/base/latex/NChisquare.tex
 share/R/library/base/latex/NULL.tex
@@ -1586,6 +1601,7 @@ share/R/library/base/latex/box.tex
 share/R/library/base/latex/boxplot.stats.tex
 share/R/library/base/latex/boxplot.tex
 share/R/library/base/latex/browser.tex
+share/R/library/base/latex/bug.report.tex
 share/R/library/base/latex/bxp.tex
 share/R/library/base/latex/c.tex
 share/R/library/base/latex/call.tex
@@ -1763,6 +1779,7 @@ share/R/library/base/latex/model.extract.tex
 share/R/library/base/latex/model.frame.tex
 share/R/library/base/latex/model.matrix.tex
 share/R/library/base/latex/model.tables.tex
+share/R/library/base/latex/mosaicplot.tex
 share/R/library/base/latex/mtext.tex
 share/R/library/base/latex/na.action.tex
 share/R/library/base/latex/na.fail.tex
@@ -1846,6 +1863,7 @@ share/R/library/base/latex/rev.tex
 share/R/library/base/latex/rgb.tex
 share/R/library/base/latex/rivers.tex
 share/R/library/base/latex/row.tex
+share/R/library/base/latex/rowsum.tex
 share/R/library/base/latex/rug.tex
 share/R/library/base/latex/sample.tex
 share/R/library/base/latex/save.tex
@@ -1961,7 +1979,6 @@ share/R/library/modreg/R-ex/smooth.spline.R
 share/R/library/modreg/R-ex/supsmu.R
 share/R/library/modreg/R/modreg
 share/R/library/modreg/TITLE
-share/R/library/modreg/data/.keep_me
 share/R/library/modreg/help/00Titles
 share/R/library/modreg/help/AnIndex
 share/R/library/modreg/help/ksmooth
@@ -2090,7 +2107,6 @@ share/R/library/stepfun/latex/stepfun.tex
 @dirrm share/R/library/eda
 @dirrm share/R/library/modreg/R
 @dirrm share/R/library/modreg/R-ex
-@dirrm share/R/library/modreg/data
 @dirrm share/R/library/modreg/help
 @dirrm share/R/library/modreg/html
 @dirrm share/R/library/modreg/latex