From 096522cddcc132f13da9e86537200170bfed33cb Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 7 Aug 2007 19:38:11 +0000
Subject: [PATCH] Update shells/mksh to version 30.  Changes from version 29.6
 include:

* If the basename of argv[0] starts with "sh", activate FPOSIX early,
  preventing some typical ksh aliases from being defined.

* If FPOSIX, don't pre-define aliases (except integer and local) to
  benefit operating environments that never heard of the great Korn Shell.

* Support x=(a b c) bash-like array initialisation
* Support ${foo:2:3} bash-like substring expansion

* Don't try to execute ELF, a.out, COFF, gzip or MZ binaries, e.g.
  mksh /bin/sh.

* Prefer well-known signal names to alphabetically earlier ones

* Fix a bug delivering ERR and EXIT pseudo-signals to traps combined
  with "set -e".

Update from mirabilos#pkgsrc with small fixups by me.
---
 shells/mksh/DESCR    | 14 +++++---------
 shells/mksh/Makefile | 30 ++++++------------------------
 shells/mksh/distinfo | 14 +++++++-------
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/shells/mksh/DESCR b/shells/mksh/DESCR
index 69f5459f13a0..643fd8376f96 100644
--- a/shells/mksh/DESCR
+++ b/shells/mksh/DESCR
@@ -1,9 +1,5 @@
-mksh is the MirBSD enhanced version of the Public Domain Korn
-shell (pdksh), a bourne-compatible shell which is largely si-
-milar to the original AT&T Korn shell.  It includes bug fixes
-and feature improvements in order to produce a modern, robust
-shell good for interactive and especially script use.  It has
-UTF-8 support in the emacs command line editing mode; corres-
-ponds to OpenBSD 4.1-beta ksh (minus GNU bash-like $PS1); the
-build environment requirements are autoconfigured; throughout
-code simplification/bugfix/enhancement has been done.
+mksh is the MirBSD enhanced version of the Public Domain Korn shell
+(pdksh), a Bourne-compatible shell which is largely similar to the
+original AT&T Korn shell.  It includes bug fixes and feature improvements
+in order to produce a modern, robust shell good for interactive and
+especially script use.
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 672033dddabf..d9051198ee4b 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/06/20 17:20:45 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/07 19:38:11 jlam Exp $
 
-DISTNAME=			mksh-R29f
-PKGNAME=			mksh-29.6
+DISTNAME=			mksh-R30
+PKGNAME=			${DISTNAME:S/-R/-/}
 CATEGORIES=			shells
 MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 				http://pub.allbsd.org/MirOS/dist/mir/mksh/
@@ -19,39 +19,21 @@ PKG_DESTDIR_SUPPORT=		user-destdir
 
 PKG_SHELL=			bin/mksh
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.mksh
-PKG_SUPPORTED_OPTIONS=		static
-
-.include "../../mk/bsd.options.mk"
-
-BUILD_PARMS=			-r	# don't call nRoff
-
-.if empty(PKG_OPTIONS:Mstatic)
-BUILD_PARMS+=			-d	# build dynamically linked
-.else
-BUILD_PARMS+=			-nd	# build statically linked
-.endif
-
-LIBS+=				${LDADD}
-.if ${OPSYS} == "Interix"
-LIBS+=				-lcrypt
-.endif
+LIBS.Interix+=			-lcrypt
 
 INSTALLATION_DIRS=		bin ${PKGMANDIR}/man1 share/examples/mksh
 
 do-build:
 	cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
 	    CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
-	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh ${BUILD_PARMS}
+	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${DESTDIR}${PREFIX}/bin/mksh
 	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${DESTDIR}${PREFIX}/share/examples/mksh/
 
-# comment this out if you do not want to run the regression tests
+# Uncomment this if you want to run the regression tests
 #USE_TOOLS+=			perl
 #do-test:
 #	${WRKBUILD}/test.sh -v
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index de4a8d03aa9b..6059be065f5e 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/06/20 17:20:45 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/08/07 19:38:11 jlam Exp $
 
-MD5 (mksh-R29f.cpio.gz) = 83b4ca84faa1a1ea4cf6db6eb41a0384
-RMD160 (mksh-R29f.cpio.gz) = eddf9b3292d50171d8b9d6429279f0eb42a4b9ff
-SHA1 (mksh-R29f.cpio.gz) = b71c9c7f7a2ffc6cb0209ab8635ee6f59c215bcb
-SHA256 (mksh-R29f.cpio.gz) = 9b1b9c84407ac444712c4d4cd33ea9353fd4da465bb39cd7e1be1c548d1429ca
-Size (mksh-R29f.cpio.gz) = 240805 bytes
-TIGER (mksh-R29f.cpio.gz) = 5b21adea37e42274bd692518ddd4dedcff5f65e6f113a90b
\ No newline at end of file
+MD5 (mksh-R30.cpio.gz) = 184a63aa5b1450581dc463148f3d245e
+RMD160 (mksh-R30.cpio.gz) = a23a1df6d7158e78283422d64db19a15f10e81b8
+SHA1 (mksh-R30.cpio.gz) = 2784ffb60e53d0739b06512f1642d867ccd23319
+SHA256 (mksh-R30.cpio.gz) = c03b06a85401a2dada6a9c8f7141e54d4160025b0b4e508b8507a358a61a9dc2
+Size (mksh-R30.cpio.gz) = 245700 bytes
+TIGER (mksh-R30.cpio.gz) = e5e8cdd8edc7530a8b486c5fc00b551aafe396954c147a95