Upgrade to version 1.6 release of rc, the Unix clone of the Plan 9 shell.

This version has GNU autoconf support, a new master site, and a home page.

10 files changed, 10 insertions, 189 deletions

diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 85734bb0d1c..2ff4fe81b6d 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 1998/06/22 13:01:52 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/06/03 10:29:48 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
 #
 
-DISTNAME=       rc-1.5betadev-1
-PKGNAME=	rc-1.5b1
+DISTNAME=       rc-1.6
 CATEGORIES=	plan9
-MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/rc/
+MASTER_SITES=   http://www.star.le.ac.uk/%7Etjg/rc/release/
 
 MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.star.le.ac.uk/%7Etjg/rc/
 
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-history
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/plan9/rc/files/md5 b/plan9/rc/files/md5
index 63327663555..d1138a87946 100644
--- a/plan9/rc/files/md5
+++ b/plan9/rc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:34 agc Exp $
+$NetBSD: md5,v 1.3 1999/06/03 10:29:49 agc Exp $
 
-MD5 (rc-1.5betadev-1.tar.gz) = 4ddd5d227fe3817da9cf2781702a6c8b
+MD5 (rc-1.6.tar.gz) = 3b56f0e47e8496ea0363ebc202bcac23
diff --git a/plan9/rc/patches/patch-aa b/plan9/rc/patches/patch-aa
deleted file mode 100644
index 45eb26649e0..00000000000
--- a/plan9/rc/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.6 1998/08/23 05:52:46 garbled Exp $
-*** Makefile.orig	Mon Mar  7 03:32:46 1994
---- Makefile	Wed Aug 20 15:19:15 1997
-***************
-*** 16,23 ****
-  #ADDON=addon.o
-  
-  # Use an ANSI compiler (or at least one that groks prototypes and void *):
-! CC=gcc -g -O
-! CFLAGS=
-  LDFLAGS=
-  
-  # You may substitute "bison -y" for yacc. (You want to choose the one that
---- 16,23 ----
-  #ADDON=addon.o
-  
-  # Use an ANSI compiler (or at least one that groks prototypes and void *):
-! CC=gcc
-! CFLAGS= -O2
-  LDFLAGS=
-  
-  # You may substitute "bison -y" for yacc. (You want to choose the one that
-***************
-*** 28,33 ****
---- 28,46 ----
-  	glob.o glom.o hash.o heredoc.o input.o lex.o list.o main.o match.o \
-  	nalloc.o open.o print.o redir.o sigmsgs.o signal.o status.o tree.o \
-  	utils.o var.o version.o wait.o walk.o which.o y.tab.o
-+ 
-+ all: rc history
-+ 
-+ install:
-+ 	$(INSTALL) -c rc $(PREFIX)/bin
-+ 	$(INSTALL) -c history/history $(PREFIX)/bin
-+ 	for i in - -- -p --p; do rm -f $(PREFIX)/bin/$$i; ln $(PREFIX)/bin/history $(PREFIX)/bin/$$i; done
-+ 	$(INSTALL) -c rc.1 $(PREFIX)/man/man1
-+ 	$(INSTALL) -c history/history.1 $(PREFIX)/man/man1
-+ 	strip $(PREFIX)/bin/rc
-+ 	strip $(PREFIX)/bin/history
-+ 	gzip -9nf $(PREFIX)/man/man1/rc.1
-+ 	gzip -9nf $(PREFIX)/man/man1/history.1
-  
-  # If rc is compiled with READLINE defined, you must supply the correct
-  # arguments to ld on this line. Typically this would be something like:
diff --git a/plan9/rc/patches/patch-ab b/plan9/rc/patches/patch-ab
deleted file mode 100644
index f8f70cdf164..00000000000
--- a/plan9/rc/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/08/23 05:52:46 garbled Exp $
---- builtins.c.orig	Mon Mar  7 03:32:49 1994
-+++ builtins.c	Tue Feb 24 11:04:28 1998
-@@ -466,12 +466,18 @@
- 
- #ifndef SYSVR4
- extern int getrlimit(int, struct rlimit *);
-+
-+/* #ifndef __FreeBSD__ */
-+#include <sys/param.h>
-+#if !(defined(BSD) && BSD >= 199306)
- extern int setrlimit(int, struct rlimit *);
- #endif
- 
-+#endif
-+
- static void printlimit(const Limit *limit, bool hard) {
- 	struct rlimit rlim;
--	long lim;
-+	u_quad_t lim;
- 	getrlimit(limit->flag, &rlim);
- 	if (hard)
- 		lim = rlim.rlim_max;
-@@ -481,16 +487,19 @@
- 		fprint(1, "%s \tunlimited\n", limit->name);
- 	else {
- 		const Suffix *suf;
-+		char buf[1024];
- 		for (suf = limit->suffix; suf != NULL; suf = suf->next)
- 			if (lim % suf->amount == 0 && (lim != 0 || suf->amount > 1)) {
- 				lim /= suf->amount;
- 				break;
- 			}
--		fprint(1, "%s \t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
-+		(void) snprintf(buf, sizeof(buf), "%s \t%qu%s\n",
-+			limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
-+		fprint(1, "%s", buf);
- 	}
- }
- 
--static long parselimit(const Limit *limit, char *s) {
-+static u_quad_t parselimit(const Limit *limit, char *s) {
- 	char *t;
- 	int len = strlen(s);
- 	long lim = 1;
diff --git a/plan9/rc/patches/patch-ac b/plan9/rc/patches/patch-ac
deleted file mode 100644
index bc7f8cab8f2..00000000000
--- a/plan9/rc/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/08/23 05:52:47 garbled Exp $
-*** utils.c.orig	Wed Aug 20 15:26:52 1997
---- utils.c	Wed Aug 20 15:28:11 1997
-***************
-*** 5,10 ****
---- 5,12 ----
-  #include "rc.h"
-  #include "jbwrap.h"
-  
-+ #include <sys/param.h>
-+ 
-  /* print error with line number on noninteractive shells (i.e., scripts) */
-  
-  extern void pr_error(char *s) {
-***************
-*** 19,26 ****
---- 21,30 ----
-  /* our perror */
-  
-  extern void uerror(char *s) {
-+ #if !(defined(BSD) && BSD >= 199306)
-  	extern int sys_nerr;
-  	extern char *sys_errlist[];
-+ #endif
-  	if (errno > sys_nerr)
-  		return;
-  	if (s != NULL)
diff --git a/plan9/rc/patches/patch-ad b/plan9/rc/patches/patch-ad
deleted file mode 100644
index 31a2e6f64bb..00000000000
--- a/plan9/rc/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1998/08/23 05:52:47 garbled Exp $
---- proto.h.orig	Sun Mar  6 20:33:11 1994
-+++ proto.h	Mon Jul 13 02:29:15 1998
-@@ -15,2 +15,3 @@
- */
-+#include <sys/param.h>
- 
-@@ -34,7 +35,10 @@
- 
-+#if !(defined(BSD) && BSD >= 199306)
- extern void exit(int);
- extern void qsort(void *, SIZE_T, SIZE_T, int (*)(const void *, const void *));
--
-+#else
-+#include <stdlib.h>
-+#endif
- /* fake string.h */
--
-+#if !(defined(BSD) && BSD >= 199306)
- extern int strncmp(const char *, const char *, SIZE_T);
-@@ -50,2 +54,5 @@
- extern void *memset(void *, int, SIZE_T);
-+#else
-+#include <string.h>
-+#endif
- 
-@@ -67,3 +74,4 @@
- extern int isatty(int);
--#ifndef SYSVR4 /* declares AND defines this in sys/stat.h!! */
-+#if !defined(SYSVR4) && !(defined(BSD) && BSD >= 199306)
-+/* SVR4 declares AND defines this in sys/stat.h!! */
- extern int mknod(const char *, int, int);
diff --git a/plan9/rc/patches/patch-ae b/plan9/rc/patches/patch-ae
deleted file mode 100644
index f74b56934a2..00000000000
--- a/plan9/rc/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/08/23 05:52:47 garbled Exp $
---- nalloc.c.orig	Mon Jul 13 02:32:50 1998
-+++ nalloc.c	Mon Jul 13 02:34:46 1998
-@@ -113,3 +113,5 @@
- extern void *ealloc(SIZE_T n) {
-+#if !(defined(BSD) && BSD >= 199306)
- 	extern void *malloc(SIZE_T);
-+#endif
- 	void *p = malloc(n);
-@@ -123,3 +125,5 @@
- extern void *erealloc(void *p, SIZE_T n) {
-+#if !(defined(BSD) && BSD >= 199306)
- 	extern void *realloc(void *, SIZE_T);
-+#endif
- 	if (p == NULL)		/* convenience feature */
diff --git a/plan9/rc/patches/patch-af b/plan9/rc/patches/patch-af
deleted file mode 100644
index d559276ce93..00000000000
--- a/plan9/rc/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 1998/10/25 10:14:06 frueauf Exp $
-
---- config.h-dist-orig	Mon May 25 20:12:57 1992
-+++ config.h-dist	Sun Oct 25 10:56:32 1998
-@@ -88,8 +88,8 @@
-  * define PROTECT_ENV for this hack. (Known offenders: every sh I have tried;
-  * SunOS (silently discards), NeXT (aborts with error), SGI (aborts with
-  * error), Ultrix (sh seems to work, sh5 aborts with error))
--#define PROTECT_ENV
-  */
-+#define PROTECT_ENV
- 
- /*
-  * Define the macro NOECHO if you wish to omit rc's echo builtin from the
diff --git a/plan9/rc/pkg/DESCR b/plan9/rc/pkg/DESCR
index 90ecb689fec..832a0f8e53b 100644
--- a/plan9/rc/pkg/DESCR
+++ b/plan9/rc/pkg/DESCR
@@ -1,6 +1,6 @@
 Excerpts from the README:
 
-  This is release 1.5 of rc.
+  This is release 1.6 of rc.
 
   A unix version of the Plan-9 Shell.
 
@@ -19,4 +19,3 @@ Excerpts from the README:
   certain bits and pieces to rc (notably the limits code, print.c,
   most of which.c and the backquote redirection code).
 
-eric.
diff --git a/plan9/rc/pkg/PLIST b/plan9/rc/pkg/PLIST
index 78d004238cf..78c22ecc07d 100644
--- a/plan9/rc/pkg/PLIST
+++ b/plan9/rc/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:04:02 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/06/03 10:29:52 agc Exp $
 bin/rc
-bin/history
 bin/-
 bin/--
 bin/-p