Update osh to version 20070324. This is for PR 36080 from upstream

developer.

pkgsrc changes include:

Use BUILD_TARGET=oshall as request in PR.
And make it work with PKGMANDIR.

CHANGES file includes:

Changes that improve compatibility w/ the Sixth Edition Unix shell
are marked w/ a `C:' in the details below.

-------------------------------------------------------------------------------
[osh-20070324]:
osh.c:
	* In main(), changed when fdfree() is called so that it is in a more
	  ideal sequence with other operations according to how the shell is
	  invoked (e.g., interactive shell vs. non-interactive shell).

-------------------------------------------------------------------------------
[osh-20070321]:
	* Imported the project into a local subversion repository.

	* Changed the all of the code to "#include <stdbool.h>" and to use
	  the "bool" data-type macro where appropriate.

Makefile:
	* Added SYSCONFDIR and a new `man' target.

osh.c:
	* Defined _PATH_SYSTEM_LOGIN as `SYSCONFDIR/**/"/osh.login"' instead
	  of "/etc/osh.login" so that the user can use SYSCONFDIR (/etc by
	  default) at build-time to specify the directory where the shell
	  shall search for its system-wide initialization file.

	* Added a new special parameter, $v, which makes the version of the
	  osh package available as a read-only string.  The format is
	  `osh-YYYYMMDD' for official releases and `osh-current (YYYYMMDD)'
	  (interpreted as one word) for development snapshots.

	* Fixed a bug where interactive shells were no longer ignoring SIGTERM
	  when invoked, as they are supposed to.  Now, SIGTERM is being ignored
	  again upon invocation of all interactive shells.

	* Fixed the output from doing a `sigign' so that it matches its
	  documentation in osh.1: "..., a list is printed of those signals
	  which are ignored by sigign in the current shell."

	  Previously, the output from a `sigign' could be a little confusing.
	  Now, its output only indicates those cases where a given signal is
	  being ignored w/ the possibility that it can then be unignored
	  (reset) in the current shell context.

if.c:
	* Added 3 new primaries: -ef (equal files - same device, same inode),
	  -nt (newer than), -ot (older than).  See the if(1) manual page for
	  full details.

-------------------------------------------------------------------------------
[osh-20070131]:
osh.1:
	* Made a few minimal changes to synchronize the manual w/ the code.

osh.c	1.2 (jneitzel) 2007/01/14:
	* Changed the `chdir: No old directory' diagnostic to
	  `chdir: No previous directory' to match the manual.

-------------------------------------------------------------------------------
[osh-20061230]:
	The following files have been removed in this release:
		examples/*: These files are now available at:
			    http://jneitzel.sdf1.org/osh/initialization_files/
		   tests/*: ... until I have a chance to rewrite them ...

*.1:
	* Changed all instances of `UNIX' to `Unix' since the name
	  of the Unix operating system is not an acronym.

pexec.c:
	* Fixed a possible, but very unlikely, memory leak.

osh.c:
	C: Rewrote the shell!  It is now a combination of the ports of the
	   original source code from sh6.c and glob6.c (see CHANGES_sh-to-sh6)
	   w/ the prior enhancements which were found in osh-060124/osh*.[ch] .

fd2.c:
	* Removed the call to lseek(2) to end-of-file for errors.
	  The shell determines when this is necessary.

	* Changed the `: no shell' diagnostic to `: No shell!'
	  in the spirit of sh6(1).

goto.c:
	* Fixed a bug which interfered w/ finding a requested label when
	  its first character had the high-order bit set.  The value of the
	  first character is now passed to getlabel() as an unsigned char
	  converted to an int to allow correct comparison in such a case.

if.c:
	* Removed the call to lseek(2) to end-of-file for errors.
	  The shell determines when this is necessary.

	* Changed the method used to build the argument list for all commands
	  executed by this utility, and removed the `Too many args' diagnostic.
	  The maximum length of the argument list for a command is now limited
	  only by the maximum length that the invoker can pass and by any
	  system-imposed limit for execve(2) (see E2BIG in errno(2)).

	* Changed the `: no shell' diagnostic to `: No shell!'
	  in the spirit of sh6(1).

	* Changed the diagnostic used for `!', `-a', `-o', and `(' operator
	  errors from `: argument expected' to `: expression expected'.

3 files changed, 23 insertions, 6 deletions

diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index fb348ea739d..4edb46fdb44 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2006/10/17 12:31:22 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/03/26 16:43:34 reed Exp $
 
-DISTNAME=	osh-060124
+DISTNAME=	osh-20070324
 CATEGORIES=	shells
 MASTER_SITES=	http://jneitzel.sdf1.org/osh/src/
 
@@ -12,6 +12,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PKG_SHELL=		bin/osh
 
+BUILD_TARGET=	oshall
 TEST_TARGET=	check
 
+MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/distinfo b/shells/osh/distinfo
index b4ad669b603..79c68544b59 100644
--- a/shells/osh/distinfo
+++ b/shells/osh/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/10/17 12:31:22 obache Exp $
+$NetBSD: distinfo,v 1.9 2007/03/26 16:43:34 reed Exp $
 
-SHA1 (osh-060124.tar.gz) = 91f837b78bf6eeaddc967988c9c6fa6f52b7de78
-RMD160 (osh-060124.tar.gz) = 846f9520847f770371846cd58210e3ee31b938e5
-Size (osh-060124.tar.gz) = 88434 bytes
+SHA1 (osh-20070324.tar.gz) = acd0747578430bd259949b270308ceb5e13a4b2a
+RMD160 (osh-20070324.tar.gz) = fc120073598cccd3bdfbbe2bed88d0a8329fef80
+Size (osh-20070324.tar.gz) = 77522 bytes
+SHA1 (patch-aa) = 38db4c0e207a0f2cf175b77d3339cd17a4db6362
diff --git a/shells/osh/patches/patch-aa b/shells/osh/patches/patch-aa
new file mode 100644
index 00000000000..05d2fcb3852
--- /dev/null
+++ b/shells/osh/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2007/03/26 16:43:34 reed Exp $
+
+--- Makefile.orig	2007-03-26 11:36:27.000000000 -0500
++++ Makefile	2007-03-26 11:36:43.000000000 -0500
+@@ -42,7 +42,7 @@
+ #
+ PREFIX?=	/usr/local
+ BINDIR?=	$(PREFIX)/bin
+-MANDIR=		$(PREFIX)/man/man1
++MANDIR?=		$(PREFIX)/man/man1
+ SYSCONFDIR?=	/etc
+ #BINGRP=		-g bin
+ BINMODE=	-m 0555