4 files changed, 29 insertions, 49 deletions

diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index f0395687ba7a..1ad9e6e92f05 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,19 +1,20 @@
-# New ports collection makefile for:    rc
-# Version required:     1.5b1
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
+# New ports collection makefile for:	rc
+# Version required:	1.6
+# Date created:		Sun Aug 13 12:36:14 CDT 1995
+# Whom:			erich@rrnet.com
 #
-# $Id: Makefile,v 1.6 1999/01/09 03:19:39 asami Exp $
+# $Id: Makefile,v 1.7 1999/03/15 04:34:14 steve Exp $
 #
 
-DISTNAME=	rc-1.5b2
+DISTNAME=	rc-1.6
 CATEGORIES=	shells plan9
-MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/rc/
+MASTER_SITES=	http://www.star.le.ac.uk/~tjg/rc/release/ \
+		ftp://ftp.sys.utoronto.ca/pub/rc/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	saken@hotel.rmta.org
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-history
+CONFIGURE_ARGS=	--with-history
 MAN1=		history.1 rc.1
 
 .include <bsd.port.mk>
diff --git a/shells/rc/distinfo b/shells/rc/distinfo
index 8eefb05b1269..312becf7868f 100644
--- a/shells/rc/distinfo
+++ b/shells/rc/distinfo
@@ -1 +1 @@
-MD5 (rc-1.5b2.tar.gz) = 4acc56de6a5595e4fd3f26c84856e699
+MD5 (rc-1.6.tar.gz) = 3b56f0e47e8496ea0363ebc202bcac23
diff --git a/shells/rc/files/patch-aa b/shells/rc/files/patch-aa
index 144c7fc980cd..aeb20f1f642c 100644
--- a/shells/rc/files/patch-aa
+++ b/shells/rc/files/patch-aa
@@ -1,20 +1,11 @@
---- Makefile.in.orig	Mon Jul  7 10:43:52 1997
-+++ Makefile.in	Sun Mar  7 23:01:22 1999
-@@ -15,7 +15,7 @@
- INSTALL=@INSTALL@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
--LN=@LN@
-+LN=@LN@ -f
- YACC=@YACC@
- 
- HISTORY=@HISTORY@
-@@ -28,7 +28,7 @@
- all: rc $(HISTORY)
- 
- rc: $(OBJS)
--	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
-+	$(CC) -static -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
- 
- sigmsgs.c: mksignal
- 	sh mksignal @SIGNAL_H@
+--- Makefile.in.orig	Fri Jun 25 10:04:52 1999
++++ Makefile.in	Fri Jun 25 10:05:07 1999
+@@ -109,7 +109,7 @@
+ glom.o hash.o heredoc.o input.o lex.o list.o main.o match.o nalloc.o \
+ open.o parse.o print.o redir.o signal.o status.o tree.o utils.o var.o \
+ wait.o walk.o which.o
+-rc_LDFLAGS = 
++rc_LDFLAGS = -static
+ mksignal_SOURCES = mksignal.c
+ mksignal_OBJECTS =  mksignal.o
+ mksignal_LDADD = $(LDADD)
diff --git a/shells/rc/pkg-descr b/shells/rc/pkg-descr
index 90ecb689fecd..278411263b35 100644
--- a/shells/rc/pkg-descr
+++ b/shells/rc/pkg-descr
@@ -1,22 +1,10 @@
-Excerpts from the README:
+This is a reimplementation for Unix, by Byron Rakitzis, of the Plan
+9 shell. rc offers much the same capabilities as a traditional
+Bourne shell, but with a much cleaner syntax.
 
-  This is release 1.5 of rc.
+See the end of the man page, under "INCOMPATABILITIES" for (known?)
+differences from the "real" rc.
 
-  A unix version of the Plan-9 Shell.
+WWW: http://www.star.le.ac.uk/~tjg/rc/
 
-  FEEPING CREATURISM
-
-  See the end of the man page, under "INCOMPATABILITIES" for (known?)
-  differences from the "real" rc. Most of these changes were necessary
-  to get rc to work in a reasonable fashion on a real (i.e., commercial,
-  non-Labs) UNIX system; a few were changes motivated by concern
-  about some inadequacies in the original design.
-
-  CREDITS
-
-  This shell was written by Byron Rakitzis, but kudos go to Paul
-  Haahr for letting me know what a shell should do and for contributing
-  certain bits and pieces to rc (notably the limits code, print.c,
-  most of which.c and the backquote redirection code).
-
-eric.
+Scott Kenney <saken@hotel.rmta.org>