switch back to rc-1.6; ok sturm@

This commit is contained in:
markus 2003-05-15 03:25:56 +00:00
parent 519d6fed8c
commit a1c70bcbe4
6 changed files with 26 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2002/12/03 19:51:25 markus Exp $
# $OpenBSD: Makefile,v 1.13 2003/05/15 03:25:56 markus Exp $
COMMENT= "shell (clone of plan9 shell)"
DISTNAME= rc-1.7
DISTNAME= rc-1.6
CATEGORIES= plan9 shells
MASTER_SITES= http://www.star.le.ac.uk/~tjg/rc/release/ \
ftp://ftp.sys.toronto.edu/pub/rc/
@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-readline
DISTFILES= ${DISTNAME}.tar.gz editline-1.5.tar.gz:0
EDITLINE= ${WRKSRC}/../editline
CONFIGURE_ARGS+= --with-editline
CONFIGURE_ENV= LDFLAGS="-L${EDITLINE}"
CONFIGURE_ENV= LIBS="-L${EDITLINE}"
.endif
.if ${FLAVOR:L} == "editline"

View File

@ -1,6 +1,6 @@
MD5 (editline-1.5.tar.gz) = c0b9355a84efad07e23b2d5dce745522
MD5 (rc-1.7.tar.gz) = 657bb1c1a9aad8c46218185414539293
MD5 (rc-1.6.tar.gz) = 3b56f0e47e8496ea0363ebc202bcac23
RMD160 (editline-1.5.tar.gz) = b343f870fc7ec7e4853a17675b253402f6c35aab
RMD160 (rc-1.7.tar.gz) = e8a657db93136dfd40062b45b4e4ea73cbfe8fc3
RMD160 (rc-1.6.tar.gz) = 766453e1d55f44de94c690959aee1dc8d8a77365
SHA1 (editline-1.5.tar.gz) = c4c0569a18cdd03185887a7b78fcfbbd12865c45
SHA1 (rc-1.7.tar.gz) = 7a7511f7ef54f1883aa73e572b0a66e476421829
SHA1 (rc-1.6.tar.gz) = e223c5f3a34aa836034cc033751c276ff05fcc8e

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2002/12/03 19:51:26 markus Exp $
--- Makefile.in.orig Wed Jun 19 17:12:04 2002
+++ Makefile.in Sun Dec 1 13:11:14 2002
@@ -533,10 +533,10 @@ trip: rc tripping
$OpenBSD: patch-Makefile_in,v 1.3 2003/05/15 03:25:56 markus Exp $
--- Makefile.in.orig Wed Jun 7 02:07:28 2000
+++ Makefile.in Wed Jun 7 02:09:33 2000
@@ -517,10 +517,10 @@ trip: rc tripping
./rc -p < $(srcdir)/trip.rc
install-exec-hook:

View File

@ -1,11 +0,0 @@
--- hash.c.orig Thu Apr 4 12:08:22 2002
+++ hash.c Wed Feb 19 22:14:51 2003
@@ -241,7 +241,7 @@
bool flag;
};
static struct nameflag maybeexport[] = {
- { "prompt", FALSE },
+ /* { "prompt", FALSE },*/
{ "version", FALSE }
};

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-history_c,v 1.2 2002/12/03 19:51:26 markus Exp $
--- history.c.orig Mon Dec 2 11:15:01 2002
+++ history.c Mon Dec 2 11:15:20 2002
@@ -339,7 +339,7 @@ next: s = getcommand();
$OpenBSD: patch-history_c,v 1.3 2003/05/15 03:25:56 markus Exp $
--- history.c.orig Wed Nov 20 21:43:31 2002
+++ history.c Wed Nov 20 21:43:52 2002
@@ -331,7 +331,7 @@ next: s = getcommand();
fprintf(stderr, "%s\n", s);
if (shell == NULL)
shell = "/bin/sh";

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-print_c,v 1.3 2003/05/15 03:25:56 markus Exp $
--- print.c.orig Wed Nov 20 21:42:09 2002
+++ print.c Wed Nov 20 21:42:50 2002
@@ -103,8 +103,6 @@ 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);
else
n = va_arg(format->args, int);