4 files changed, 25 insertions, 100 deletions

diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 16b9fad62dc4..f0395687ba7a 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -3,18 +3,17 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.5 1998/11/21 17:18:16 steve Exp $
+# $Id: Makefile,v 1.6 1999/01/09 03:19:39 asami Exp $
 #
 
-DISTNAME=       rc-1.5betadev-1
-PKGNAME=	rc-1.5b1
+DISTNAME=	rc-1.5b2
 CATEGORIES=	shells plan9
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/rc/
 
 MAINTAINER=	erich@FreeBSD.org
 
-NO_WRKSUBDIR=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS= --enable-history
 MAN1=		history.1 rc.1
-MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff --git a/shells/rc/distinfo b/shells/rc/distinfo
index a510c99d59aa..8eefb05b1269 100644
--- a/shells/rc/distinfo
+++ b/shells/rc/distinfo
@@ -1 +1 @@
-MD5 (rc-1.5betadev-1.tar.gz) = 4ddd5d227fe3817da9cf2781702a6c8b
+MD5 (rc-1.5b2.tar.gz) = 4acc56de6a5595e4fd3f26c84856e699
diff --git a/shells/rc/files/patch-aa b/shells/rc/files/patch-aa
index 8d0ff6190e1f..144c7fc980cd 100644
--- a/shells/rc/files/patch-aa
+++ b/shells/rc/files/patch-aa
@@ -1,93 +1,20 @@
-*** Makefile.orig	Sun Mar  6 21:32:46 1994
---- Makefile	Fri Aug 11 16:00:41 1995
-***************
-*** 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
-***************
-*** 29,34 ****
---- 29,47 ----
-  	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:
-  #
-*** builtins.c.orig	Sun Mar  6 21:32:49 1994
---- builtins.c	Mon Jul 31 12:27:12 1995
-***************
-*** 466,477 ****
-  
-  #ifndef SYSVR4
-  extern int getrlimit(int, struct rlimit *);
-  extern int setrlimit(int, struct rlimit *);
-  #endif
-  
-  static void printlimit(const Limit *limit, bool hard) {
-  	struct rlimit rlim;
-! 	long lim;
-  	getrlimit(limit->flag, &rlim);
-  	if (hard)
-  		lim = rlim.rlim_max;
---- 466,481 ----
-  
-  #ifndef SYSVR4
-  extern int getrlimit(int, struct rlimit *);
-+ 
-+ #ifndef __FreeBSD__
-  extern int setrlimit(int, struct rlimit *);
-  #endif
-  
-+ #endif
-+ 
-  static void printlimit(const Limit *limit, bool hard) {
-  	struct rlimit rlim;
-! 	u_quad_t lim;
-  	getrlimit(limit->flag, &rlim);
-  	if (hard)
-  		lim = rlim.rlim_max;
-***************
-*** 490,496 ****
-  	}
-  }
-  
-! static long parselimit(const Limit *limit, char *s) {
-  	char *t;
-  	int len = strlen(s);
-  	long lim = 1;
---- 494,500 ----
-  	}
-  }
-  
-! static u_quad_t parselimit(const Limit *limit, char *s) {
-  	char *t;
-  	int len = strlen(s);
-  	long lim = 1;
+--- 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@
diff --git a/shells/rc/pkg-plist b/shells/rc/pkg-plist
index 593072485242..01950bd106d0 100644
--- a/shells/rc/pkg-plist
+++ b/shells/rc/pkg-plist
@@ -1,5 +1,4 @@
 bin/rc
-bin/history
 bin/-
 bin/--
 bin/-p