Update osh to 20080109.

Based on patch provided by Jeffrey Allen Neitzel in PR 37737.
My modification:
 * Honor PKGMANDIR
 * Update MASTER_SITES and HOMEPAGE to new location.

Changes:
[osh-20080109]:
	* New file:  mkconfig  (see Build/Install Changes)

	* Moved files:	Moved manual pages from *.1 to *.1.in to make their
			generation and installation simpler in the Makefile.

Build/Install Changes:
	* Stopped defining _XOPEN_SOURCE when compiling on Mac OS X, NetBSD,
	  and OpenBSD.  It is simply not necessary.  However, _XOPEN_SOURCE
	  and _BSD_SOURCE are necessary on GNU/Linux systems.

	* Added a simple configure script, mkconfig.  It is automatically
	  invoked from the Makefile to write out an appropriate "config.h"
	  file according to the osh package's needs on the given system.  It
	  simply sets PATH_LOGIN, PATH_NEWGRP, _XOPEN_SOURCE, and _BSD_SOURCE
	  as needed so that the user does not need to bother w/ doing it
	  manually at build time.

osh.c:
	* Patched the code to fix a "$0" parameter-substitution problem w/
	  the `source' command in the following interactive context:

		% cat >file
		echo \$0 == \"$0\"
		echo \$1 == \"$1\"
		^D
		% source file ;		: ... gives correct value for "$0".
		$0 == ""
		$1 == ""
		% source file arg ;	: ... gives incorrect value for "$0".
		$0 == "0"
		$1 == "arg"

	  getdolp() indirectly caused the problem by returning a NULL pointer
	  when the intended result was a pointer to the empty string.  This
	  problem was not fatal, as the shell handles NULL pointers from
	  getdolp() anyway.  However, NULL is supposed to indicate an
	  error where the specified parameter means nothing to the shell...
	  For example:

		% echo \$Z == \"$Z\"
		$Z == "Z"

	* Changed the source command's parameter-substitution behavior so
	  that $0 always results in the name of the sourced command file,
	  not the name inherited from the main shell context.  This makes
	  the parameter-substitution behavior of sourced command files
	  just like that of any other osh command file.  Plus, this is
	  the documented behavior.

osh.1.in, sh6.1.in:
	* Revised some wording to remove some cases of possible ambiguity.

-------------------------------------------------------------------------------
[osh-20070707]:
	* Added a new file, INSTALL, which contains build and install
	  instructions.  Made reference to INSTALL in Makefile and README.

Makefile:
	* Added 3 new variables, MOXARCH, MOXSHELLARCH, and MOXUTILSARCH, to
	  simplify building universal binaries for Mac OS X.  These are unset
	  by default.  See INSTALL for more info.

	* Changed the default value for SYSCONFDIR from /etc to $(PREFIX)/etc.

osh.c:
	* Changed the reserved file descriptors from (7 - 9) to (10 - 12) in
	  order to avoid fd conflict w/ rxvt-unicode (version 8.2).  This
	  conflict prevented `chdir -' from functioning correctly, but this
	  problem is now fixed.

	  The problem was clearly visible when running an interactive instance
	  of osh under the rxvt-unicode daemon (urxvtd) on Mac OS X.  However,
	  I never saw this type of conflict when running under any other type
	  of terminal emulator on any OS.  Thus, I do not know if this was
	  only an osh problem, a urxvtd problem, a Mac OS X problem, or some
	  combination of the 3...

3 files changed, 8 insertions, 24 deletions

diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index b0d4fa5c704..cff4bdf8ede 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2007/05/12 16:18:55 heinz Exp $
+# $NetBSD: Makefile,v 1.20 2008/01/19 12:08:29 obache Exp $
 
-DISTNAME=	osh-20070324
-PKGREVISION=	1
+DISTNAME=	osh-20080109
 CATEGORIES=	shells
-MASTER_SITES=	http://jneitzel.sdf1.org/osh/src/
+MASTER_SITES=	http://www.v6shell.org/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://jneitzel.sdf1.org/osh/
+HOMEPAGE=	http://www.v6shell.org/
 COMMENT=	Implementation of the UNIX 6th Edition shell
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -16,7 +15,6 @@ PKG_SHELL=		bin/osh
 
 BUILD_TARGET=	oshall
 INSTALL_TARGET=	install-oshall
-TEST_TARGET=	check
 
 MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
 
diff --git a/shells/osh/distinfo b/shells/osh/distinfo
index 79c68544b59..4f655c815e7 100644
--- a/shells/osh/distinfo
+++ b/shells/osh/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/03/26 16:43:34 reed Exp $
+$NetBSD: distinfo,v 1.10 2008/01/19 12:08:29 obache Exp $
 
-SHA1 (osh-20070324.tar.gz) = acd0747578430bd259949b270308ceb5e13a4b2a
-RMD160 (osh-20070324.tar.gz) = fc120073598cccd3bdfbbe2bed88d0a8329fef80
-Size (osh-20070324.tar.gz) = 77522 bytes
-SHA1 (patch-aa) = 38db4c0e207a0f2cf175b77d3339cd17a4db6362
+SHA1 (osh-20080109.tar.gz) = 5ba6f9e6c55b0ba9f034918da1e7da89ab7dd4da
+RMD160 (osh-20080109.tar.gz) = 709d79a5e990af2c5283215c6b286e20314b3f60
+Size (osh-20080109.tar.gz) = 80549
diff --git a/shells/osh/patches/patch-aa b/shells/osh/patches/patch-aa
deleted file mode 100644
index 05d2fcb3852..00000000000
--- a/shells/osh/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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