upgrade to rc-1.7; rc-1.6 is gone from the original ftp site.

4 files changed, 8 insertions, 60 deletions

diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index f693aa3307d..9126ae96a38 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/06 00:14:28 christos Exp $
 
-DISTNAME=       rc-1.6
-PKGREVISION=	1
+DISTNAME=       rc-1.7
 CATEGORIES=	shells plan9
-MASTER_SITES=   http://www.star.le.ac.uk/%7Etjg/rc/release/
+MASTER_SITES=   http://www-ftp.lip6.fr/pub/unix/shells/rc/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.star.le.ac.uk/%7Etjg/rc/
+HOMEPAGE=	http://plan9.bell-labs.com/sys/doc/rc.html
 COMMENT=	Unix incarnation of the plan9 shell
 
 GNU_CONFIGURE=		yes
diff --git a/shells/rc/distinfo b/shells/rc/distinfo
index d90911e7951..92cfcdc2b2d 100644
--- a/shells/rc/distinfo
+++ b/shells/rc/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 20:55:46 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/04/06 00:14:28 christos Exp $
 
-SHA1 (rc-1.6.tar.gz) = e223c5f3a34aa836034cc033751c276ff05fcc8e
-RMD160 (rc-1.6.tar.gz) = 766453e1d55f44de94c690959aee1dc8d8a77365
-Size (rc-1.6.tar.gz) = 139914 bytes
-SHA1 (patch-aa) = ec47fa81ba6061318ddb1c2f59ba9495b7f906ae
-SHA1 (patch-ab) = 44d1f2e7addf8047ee37d1ac0c045e087c93e7c2
+SHA1 (rc-1.7.tar.gz) = 7a7511f7ef54f1883aa73e572b0a66e476421829
+RMD160 (rc-1.7.tar.gz) = e8a657db93136dfd40062b45b4e4ea73cbfe8fc3
+Size (rc-1.7.tar.gz) = 158449 bytes
diff --git a/shells/rc/patches/patch-aa b/shells/rc/patches/patch-aa
deleted file mode 100644
index 89cfbd1663f..00000000000
--- a/shells/rc/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.9 1999/08/03 15:00:58 agc Exp $
-
-Use the strerror(3) function - it's much better at this than we are,
-and hides the internals of the error list.
-
---- utils.c.orig	Thu Oct 29 08:26:08 1998
-+++ utils.c	Sun Jun 20 16:35:35 1999
-@@ -2,6 +2,7 @@
- 
- #include <errno.h>
- #include <setjmp.h>
-+#include <string.h>
- #include "rc.h"
- #include "jbwrap.h"
- 
-@@ -19,6 +20,7 @@
- /* our perror */
- 
- extern void uerror(char *s) {
-+#if 0
- 	extern int sys_nerr;
- 	extern char *sys_errlist[];
- 	if (errno > sys_nerr)
-@@ -27,6 +29,12 @@
- 		fprint(2, "%s: %s\n", s, sys_errlist[errno]);
- 	else
- 		fprint(2, "%s\n", sys_errlist[errno]);
-+#else
-+	if (s != (char *) NULL) {
-+		fprint(2, "%s: ", s);
-+	}
-+	fprint(2, "%s\n", strerror(errno));
-+#endif
- }
- 
- /* Die horribly. This should never get called. Please let me know if it does. */
diff --git a/shells/rc/patches/patch-ab b/shells/rc/patches/patch-ab
deleted file mode 100644
index ece255c152f..00000000000
--- a/shells/rc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/01/08 20:56:07 joerg Exp $
-
---- print.c.orig	2006-01-08 20:54:47.000000000 +0000
-+++ print.c
-@@ -104,7 +104,7 @@ static void intconv(Format *format, unsi
- 	if (flags & FMT_long)
- 		n = va_arg(format->args, long);
- 	else if (flags & FMT_short)
--		n = va_arg(format->args, short);
-+		n = va_arg(format->args, int);
- 	else
- 		n = va_arg(format->args, int);
-