bosh: Rebase to schily-2018-10-30

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Mon Nov 5 12:42:19 2018 +0100
Changeset:	fb19dc3a0f781ddaa5b0987a211de36fdf9d0144

Modified Files:
	bosh/Makefile
	bosh/TODO
	bosh/distinfo
Removed Files:
	bosh/patches/patch-sh_main.c

Log Message:
bosh: Rebase to schily-2018-10-30

Locale patch removed (merged upstream).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fb19dc3a0f781ddaa5b0987a211de36fdf9d0144

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bosh/Makefile                |  4 ++--
 bosh/TODO                    |  1 +
 bosh/distinfo                |  9 ++++-----
 bosh/patches/patch-sh_main.c | 24 ------------------------
 4 files changed, 7 insertions(+), 31 deletions(-)

diffs:
diff --git a/bosh/Makefile b/bosh/Makefile
index a8a39e417c..02bfcaf6a1 100644
--- a/bosh/Makefile
+++ b/bosh/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	schily-2018-10-11
-PKGNAME=	bosh-20181011
+DISTNAME=	schily-2018-10-30
+PKGNAME=	bosh-20181030
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/bosh/TODO b/bosh/TODO
index c0e3cccf50..9c694f0348 100644
--- a/bosh/TODO
+++ b/bosh/TODO
@@ -13,3 +13,4 @@
        Reason: "/usr/lib/locale" is expected to exist, but not there on NetBSD
     => Patch added
     => Problem reported upstream
+[X] Patch removed (merged upstream)
diff --git a/bosh/distinfo b/bosh/distinfo
index da3a39b026..c652c6da4a 100644
--- a/bosh/distinfo
+++ b/bosh/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (schily-2018-10-11.tar.bz2) = 7362b695a410cac0f4134dc8784197532a078abd
-RMD160 (schily-2018-10-11.tar.bz2) = 66fa538519e2fb5af6576ff806fccd2e9c578cb0
-SHA512 (schily-2018-10-11.tar.bz2) = e3ea44b2bde6ba91978a3c715c148c48372026762c57943a9d2900329a317b9e69a78226a192ebbc9d204ddf1dfab1688b09974d10402de0a6245e1e361a58ef
-Size (schily-2018-10-11.tar.bz2) = 4305089 bytes
-SHA1 (patch-sh_main.c) = 942d513254972b640b76c3107ce49cb2df93e2c1
+SHA1 (schily-2018-10-30.tar.bz2) = 2c70cd99d732c70193577d61793c32399fcc7378
+RMD160 (schily-2018-10-30.tar.bz2) = f5a843cde89f3e5d54b1925da288fab97990d3eb
+SHA512 (schily-2018-10-30.tar.bz2) = 72765d11eff52f744a707605a53365da69037c3d982c7b8f4cee98f109f856ee28af3420f63c3fe5a7890649c4eb0fa4dd69d367b7ec41026f288d6237c98d96
+Size (schily-2018-10-30.tar.bz2) = 4311065 bytes
diff --git a/bosh/patches/patch-sh_main.c b/bosh/patches/patch-sh_main.c
deleted file mode 100644
index 7c88601d12..0000000000
--- a/bosh/patches/patch-sh_main.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Ensure that setlocale is called on systems without "/usr/lib/locale".
-
---- sh/main.c.orig	2018-07-31 22:00:57.000000000 +0000
-+++ sh/main.c
-@@ -138,10 +138,17 @@ main(c, v, e)
- 	mypgid = getpgid(mypid);	/* get process group for this shell */
- 	mysid = getsid(mypid);		/* get process group id of leader */
- 
-+#if	defined(IS_SUN) || defined(DO_SPLIT_ROOT)
- 	/*
- 	 * Do locale processing only if /usr is mounted.
-+	 * This is to help the single user shell to work.
-+	 * Since localedir may not be the same for all target architectures
-+	 * we just disable this check for a non-Solaris environment.
- 	 */
- 	localedir_exists = (access(localedir, F_OK) == 0);
-+#else
-+	localedir_exists = TRUE;
-+#endif
- 
- 	/*
- 	 * initialize storage allocation