Date: 2 Feb 1999 16:56:58 -0000 From: saken@hotel.rmta.org To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9882: upgrade shells/rc to version 1.5b2 Message-ID: <19990202165658.7095.qmail@hotel.rmta.org>
next in thread | raw e-mail | index | archive | help
>Number: 9882 >Category: ports >Synopsis: upgrade shells/rc to latest available version (v1.5b2) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 2 09:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Scott A. Kenney >Release: FreeBSD 3.0-CURRENT i386 >Organization: Agents of Fortune, LTD >Environment: FreeBSD 3.0-CURRENT #0: Tue Jan 12 17:49:25 EST 1999 All ELF all the time :) >Description: The version of rc in the ports collection is outdated, The latest version (1.5b2) is over a year old and solves some outstanding problems with the current version, make trip reveals no errors and "limit" no longer causes a core dump. I contacted the MAINTAINER <erich@freebsd.org> seven days ago and have not had a reply. >How-To-Repeat: N/A >Fix: Apply the following patch with patch -p1, note I've configured rc to build using "-static", as it was discussed awhile ago in freebsd-ports that this is the "best" way to build shells. diff -ruN rc/Makefile rc.new/Makefile --- rc/Makefile Fri Jan 8 22:19:39 1999 +++ rc.new/Makefile Tue Jan 26 12:29:17 1999 @@ -6,15 +6,14 @@ # $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 -ruN rc/files/md5 rc.new/files/md5 --- rc/files/md5 Mon Aug 14 00:08:01 1995 +++ rc.new/files/md5 Wed Jan 13 17:23:11 1999 @@ -1 +1 @@ -MD5 (rc-1.5betadev-1.tar.gz) = 4ddd5d227fe3817da9cf2781702a6c8b +MD5 (rc-1.5b2.tar.gz) = 4acc56de6a5595e4fd3f26c84856e699 diff -ruN rc/patches/patch-aa rc.new/patches/patch-aa --- rc/patches/patch-aa Mon Aug 14 00:08:01 1995 +++ rc.new/patches/patch-aa Tue Jan 26 12:28:39 1999 @@ -1,93 +1,11 @@ -*** 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 Tue Jan 26 12:26:32 1999 ++++ Makefile.in Tue Jan 26 12:27:31 1999 +@@ -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 -ruN rc/pkg/PLIST rc.new/pkg/PLIST --- rc/pkg/PLIST Sat Oct 3 20:56:49 1998 +++ rc.new/pkg/PLIST Tue Jan 26 19:44:39 1999 @@ -1,5 +1,4 @@ bin/rc -bin/history bin/- bin/-- bin/-p >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990202165658.7095.qmail>