diff --git a/srcpkgs/rc/patches/quoting-fix.patch b/srcpkgs/rc/patches/quoting-fix.patch deleted file mode 100644 index 48490f2d59d..00000000000 --- a/srcpkgs/rc/patches/quoting-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tree.c 2001-10-01 09:21:08.000000000 -0300 -+++ tree.c.new 2007-09-30 00:36:37.968464448 -0300 -@@ -81,8 +81,9 @@ - n->u[2].i = s->u[2].i; - break; - case nWord: -- n = (*alloc)(offsetof(Node, u[2])); -+ n = (*alloc)(offsetof(Node, u[3])); - n->u[0].s = strcpy((char *) (*alloc)(strlen(s->u[0].s) + 1), s->u[0].s); -+ n->u[2].i = s->u[2].i; - if (s->u[1].s != NULL) { - size_t i = strlen(s->u[0].s); - n->u[1].s = (*alloc)(i); ---- footobar.c 2001-10-12 06:10:27.000000000 -0300 -+++ footobar.c.new 2007-09-30 00:39:06.458259082 -0300 -@@ -73,7 +73,7 @@ - case nForin: fmtprint(f, "for(%T in %T)%T", n->u[0].p, n->u[1].p, n->u[2].p); break; - case nVarsub: fmtprint(f, "$%T(%T)", n->u[0].p, n->u[1].p); break; - case nWord: -- fmtprint(f, quotep(n->u[0].s, dollar) ? "%#S" : "%S", n->u[0].s); -+ fmtprint(f, n->u[2].i || quotep(n->u[0].s, dollar) ? "%#S" : "%S", n->u[0].s); - break; - case nLappend: { - static bool inlist; diff --git a/srcpkgs/rc/template b/srcpkgs/rc/template index 3c26e3ad7d2..6b34ba1f1c2 100644 --- a/srcpkgs/rc/template +++ b/srcpkgs/rc/template @@ -1,29 +1,24 @@ # Template file for 'rc' pkgname=rc -version=1.7.1 -revision=3 +version=1.7.2 +revision=1 build_style=gnu-configure +configure_args="ac_cv_sys_restartable_syscalls=no + $(vopt_if readline --with-edit=gnu) + $(vopt_if libedit --with-edit=bsd)" +makedepends="$(vopt_if readline readline-devel) + $(vopt_if libedit libedit-devel)" register_shell="/bin/rc" short_desc="An alternative implementation of the plan 9 rc shell" maintainer="Christian Neukirchen " license="custom" homepage="http://tobold.org/article/rc" distfiles="http://static.tobold.org/$pkgname/$pkgname-$version.tar.gz" -checksum=1cff23e897a038422458ba01567a5a2650935205862c3bbf73e773807c248240 +checksum=04e762d15cccb3c3191a0f40e5158f176a21707f89cb9e0b04c8085ea7246be5 build_options="readline libedit static" build_options_default="readline" -configure_args="ac_cv_sys_restartable_syscalls=no" - -if [ "$build_option_readline" ]; then - configure_args+=" --with-readline" - makedepends="readline-devel" -elif [ "$build_option_libedit" ]; then - configure_args+=" --with-editline" - makedepends="libedit-devel" -fi - pre_configure() { if [ "$build_option_static" ]; then CFLAGS+=" -static"