From cea37e9cae0f5f26808e7d96dc380e62f8fc767c Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 23 Nov 2008 03:26:14 +0000 Subject: Update shells/osh Add new maintainer. Thank you J.A. The following is from PR #40006: I would like to maintain this package if that is acceptable. Thus, I added myself as MAINTAINER. Changed files: DESCR, Makefile, PLIST, distinfo Changes between osh-20080629 and osh-20081122 which affect the osh package on the various pkgsrc platforms are described below. ------------------------------------------------------------------------ [osh-20081122]: mkconfig: * Added a case for DragonFly BSD (uname -s == DragonFly). osh.c: * Fixed a bug introduced in osh-20061230 where the shell incorrectly handles an unescaped terminating backslash (\) character at the end of string when the shell is invoked as `osh -c string'. In this case, the terminating backslash causes the shell to incorrectly read from the standard input at the end of string. For example: % osh -c 'echo Hello\' to\ you! Hello to you! This example should instead do nothing and exit w/ a zero status. For `osh -c string', an unescaped terminating backslash should effectively turn string into a no-op. Now, it behaves as expected. ------------------------------------------------------------------------ [osh-20081026]: Makefile: * Changed the "oshall" target to only build osh since the fd2, goto, and if utilities are now built into the shell. * Changed the "install-oshall" target to only install osh and its manual pages. This includes the fd2.1, goto.1, and if.1 manual pages since they are not fully documented elsewhere. osh.c: * Renamed cmd_index() to cmd_lookup(), and changed the algorithm from a linear search to a binary search. * Added a base reallocation multiplier to glob() to reduce the number of realloc()s required for very large argument vectors while allowing the first malloc() to be a relatively small allocation for up to 126 matching file-name arguments. util.c: * This is a new file for the integrated shell utilities. * Added a new `-e' command-line option to fd2 to simplify redirecting all conventional output to the standard error as diagnostic output. * Integrated the external `fd2', `goto', and `if' shell utilities as special built-in commands to improve shell performance. Also, added `echo' as a special built-in command. Osh executes each of these built-ins in a subshell. Consequently, the I/O for each can be redirected as before, and the argument list for each can be the result of a call to glob() as before. --- shells/osh/DESCR | 10 +++++----- shells/osh/Makefile | 12 ++++++------ shells/osh/PLIST | 5 +---- shells/osh/distinfo | 8 ++++---- 4 files changed, 16 insertions(+), 19 deletions(-) (limited to 'shells') diff --git a/shells/osh/DESCR b/shells/osh/DESCR index 99e2d357d3e..214843417e1 100644 --- a/shells/osh/DESCR +++ b/shells/osh/DESCR @@ -1,5 +1,5 @@ -Osh is a re-implementation of the old and obsolete shell version, -which was in standard use up to UNIX 6th Edition and was supplied -as osh with UNIX 7th Edition. Its command language is a sparse -subset of those of modern shells and is mostly common both to sh(1) -and csh(1). +Osh is an enhanced, backward-compatible port of the original sh(1) +which was used as the standard command interpreter through Sixth +Edition UNIX. It was also distributed with Seventh Edition UNIX +as osh. Its command language is a predecessor and subset of that +which is found in the Bourne shell and C shell. diff --git a/shells/osh/Makefile b/shells/osh/Makefile index 1d6a46e7124..a0e6fcb5c00 100644 --- a/shells/osh/Makefile +++ b/shells/osh/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.21 2008/07/18 14:58:31 obache Exp $ +# $NetBSD: Makefile,v 1.22 2008/11/23 03:26:14 reed Exp $ -DISTNAME= osh-20080629 +DISTNAME= osh-20081122 CATEGORIES= shells -MASTER_SITES= http://www.v6shell.org/src/ +MASTER_SITES= http://v6shell.org/src/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.v6shell.org/ -COMMENT= Implementation of the UNIX 6th Edition shell +MAINTAINER= jan+nbsd@v6shell.org +HOMEPAGE= http://v6shell.org/ +COMMENT= Port of the Sixth Edition UNIX shell PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/shells/osh/PLIST b/shells/osh/PLIST index 4c2a6790e3e..3c5aa31ab48 100644 --- a/shells/osh/PLIST +++ b/shells/osh/PLIST @@ -1,7 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2007/03/26 17:01:59 reed Exp $ -bin/fd2 -bin/goto -bin/if +@comment $NetBSD: PLIST,v 1.7 2008/11/23 03:26:14 reed Exp $ bin/osh man/man1/fd2.1 man/man1/goto.1 diff --git a/shells/osh/distinfo b/shells/osh/distinfo index 40cbdc42f02..4ae712bc129 100644 --- a/shells/osh/distinfo +++ b/shells/osh/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.11 2008/07/18 14:58:31 obache Exp $ +$NetBSD: distinfo,v 1.12 2008/11/23 03:26:14 reed Exp $ -SHA1 (osh-20080629.tar.gz) = b5acf0068a696d7c8b9555972a53ee4d942aca65 -RMD160 (osh-20080629.tar.gz) = 2d0f2f301dc88fdad0f6adeacc108ef707e97598 -Size (osh-20080629.tar.gz) = 87211 bytes +SHA1 (osh-20081122.tar.gz) = e0caff3904e253aa76836eb12f36915e08298080 +RMD160 (osh-20081122.tar.gz) = ca055f45178109ff8a71912451bb5697468d9fbb +Size (osh-20081122.tar.gz) = 94109 bytes -- cgit v1.2.3