system/mksh: Updated for version R40f.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 25 insertions, 22 deletions

diff --git a/system/mksh/TaC-mksh.txt b/system/mksh/TaC-mksh.txt
index edc8c825e65e..13b2dd76e895 100644
--- a/system/mksh/TaC-mksh.txt
+++ b/system/mksh/TaC-mksh.txt
@@ -12,7 +12,7 @@ if any are found. We don't think so though.)
 All paths are relative to The MirOS Project's CVS repository.
 
 
-The following files form The MirBSD Korn Shell R40:
+The following files form The MirBSD Korn Shell R40e:
 - build system
   * mksh/Build.sh
 - testsuite driver
@@ -21,6 +21,7 @@ The following files form The MirBSD Korn Shell R40:
   * mksh/check.t
 - configuration with code examples
   * mksh/dot.mkshrc
+  * contrib/hosted/tg/deb/mksh/debian/.mkshrc
 - documentation
   * mksh/mksh.1
 - source code
@@ -67,12 +68,11 @@ cept the upstream provided packaging, some of which were copied from
 other places (specifically some of the Debian packaging) and most of
 which do not require a copyright licence.
 
-The mksh author acknowledges the contribution from the Public Domain
-Korn Shell and everyone who contributed to its various incarnations,
-including patches, which have found their way into mksh (not all are
-even known, but they gave up copyright anyway). The patches and sug-
-gestions from other developers, users and other shells' authors were
-also welcome.
+The creator of mksh acknowledges the contributions of several people
+to the Public Domain Korn Shell as well as suggestions and work from
+packagers, other developers etc. and everyone else who helped making
+mksh what it is today. Thanks! The MirBSD Korn Shell is covered by a
+copyright licence fallback from the author of its predecessor.
 
 
 The following files belong to mksh and are distributed inside of its
@@ -103,7 +103,8 @@ shown in Appendix B below.
 
 
 The MirOS Licence also applies as a collective-work copyright on The
-MirBSD Korn Shell.
+MirBSD Korn Shell, an authorised derivate of the 1980s Public Domain
+V7/Bourne Shell.
 
 Note that these appendices may represent the terms and conditions of
 more than one file, hence the actual wording of the files was folded
@@ -115,31 +116,32 @@ Appendix A - The MirOS Licence (OSI approved)
 ==============================
 
 The MirBSD Korn Shell (mksh) is
-Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+	      2011, 2012
 	Thorsten "mirabilos" Glaser <tg@mirbsd.org>
 All rights reserved.
 
 The mksh logo is
-Copyright © 2008, 2009
+Copyright (c) 2008, 2009
 	Lukas U. <smultron@midnightbsd.org>
-Copyright © 2008, 2009
+Copyright (c) 2008, 2009
 	Thorsten "mirabilos" Glaser <tg@mirbsd.org>
 
 
 Provided that these terms and disclaimer and all copyright notices
 are retained or reproduced in an accompanying document, permission
-is granted to deal in this work without restriction, including un‐
+is granted to deal in this work without restriction, including un-
 limited rights to use, publicly perform, distribute, sell, modify,
 merge, give away, or sublicence.
 
-This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
+This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
 the utmost extent permitted by applicable law, neither express nor
 implied; without malicious intent or gross negligence. In no event
 may a licensor, author or contributor be held liable for indirect,
 direct, other damage, loss, or other issues arising in any way out
 of dealing in the work, even if advised of the possibility of such
 damage or existence of a defect, except proven that it results out
-of said person’s immediate fault when using the work as intended.
+of said person's immediate fault when using the work as intended.
 
 
 Appendix B - The UCB (3-clause BSD) licence (OSI approved)
@@ -200,4 +202,4 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 _________________________________________________________________
-$MirOS: www/files/TaC-mksh.txt,v 1.4 2011/06/12 19:19:32 tg Exp $
+$MirOS: www/files/TaC-mksh.txt,v 1.7 2012/03/24 23:05:02 tg Exp $
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index d6f0a0221055..1331e36bb395 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mksh
 
-# Copyright (c) 2011  Markus Reichelt, Aachen, DE
+# Copyright (c) 2011-2012  Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,10 +28,11 @@
 # 2011 Jun 13 - adapted to R40
 # 2011 Aug 27 - adapted to R40b
 # 2011 Sep 07 - upstream review; minor tweaks, updated TaC-mksh.txt added
+# 2012 Apr 08 - adapted to R40f
 
 PRGNAM=mksh
-VERSION=${VERSION:-R40b}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-R40f}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index 8ca33e9b018e..7e48111c2540 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,10 +1,10 @@
 PRGNAM="mksh"
-VERSION="R40b"
+VERSION="R40f"
 HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R40b.cpio.gz"
-MD5SUM="afb08b65272ace550ec59b26a876a7de"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R40f.cpio.gz"
+MD5SUM="22c9570660c2efadf36de7b620d06966"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="markus reichelt"
 EMAIL="slackbuilds@mareichelt.de"
-APPROVED="dsomero,Erik Hanson"
+APPROVED="dsomero"