From d8a79343a14e1b0c5d36ec21eb67f51edc10334e Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 23 May 2007 11:02:32 +0000
Subject: Update to mksh-R29e. Fixes a number of display bugs, cursor
 positioning bugs and issues shown by Coverity Prevent. From Thorsten Glaser.

Add DESTDIR support.
---
 shells/mksh/DESCR    |  6 +++++-
 shells/mksh/Makefile | 33 ++++++++++++++++++++-------------
 shells/mksh/distinfo | 11 +++++++----
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/shells/mksh/DESCR b/shells/mksh/DESCR
index df031593581..69f5459f13a 100644
--- a/shells/mksh/DESCR
+++ b/shells/mksh/DESCR
@@ -2,4 +2,8 @@ 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.
+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.
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 947268fb870..78783331469 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,31 +1,37 @@
-# $NetBSD: Makefile,v 1.2 2007/02/22 19:01:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/05/23 11:02:32 joerg Exp $
 
-DISTNAME=			mksh-R28
-PKGNAME=			mksh-28
+DISTNAME=			mksh-R29e
+PKGNAME=			mksh-29.4
 CATEGORIES=			shells
-MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/
+MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
+				http://pub.allbsd.org/MirOS/dist/mir/mksh/
 EXTRACT_SUFX=			.cpio.gz
 
 MAINTAINER=			pkgsrc-users@NetBSD.org
-HOMEPAGE=			http://www.mirbsd.de/?mksh
+HOMEPAGE=			http://mirbsd.de/mksh
 COMMENT=			MirBSD Korn Shell
 
 WRKSRC=				${WRKDIR}/mksh
 WRKBUILD?=			${WRKSRC}
 
 PKG_INSTALLATION_TYPES=		pkgviews overwrite
+PKG_DESTDIR_SUPPORT=		user-destdir
+
 PKG_SHELL=			bin/mksh
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mksh
 PKG_SUPPORTED_OPTIONS=		static
-PKG_SUGGESTED_OPTIONS=		static
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mstatic)
-LDFLAGS+=			-static
+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}
@@ -33,7 +39,7 @@ LIBS+=				${LDADD}
 LIBS+=				-lcrypt
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/mksh
+INSTALLATION_DIRS=		bin ${PKGMANDIR}/man1 share/examples/mksh
 
 do-build:
 	cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
@@ -41,11 +47,12 @@ do-build:
 	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh ${BUILD_PARMS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${PREFIX}/bin/mksh
-	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${PREFIX}/share/examples/mksh
+	${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/
 
-#USE_TOOLS+=			ed:test perl:test
+# comment this out if you do not 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 21698666433..461d1ed58d1 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/15 13:00:37 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/05/23 11:02:32 joerg Exp $
 
-SHA1 (mksh-R28.cpio.gz) = 857c03be697434e36cc1663f2d1657c1eff3ae6c
-RMD160 (mksh-R28.cpio.gz) = 511926e621b73be23e0ae48fe1c09c2e1bfa7500
-Size (mksh-R28.cpio.gz) = 230291 bytes
+MD5 (mksh-R29e.cpio.gz) = b682e4b0e868dcec1262dd3e050bb56b
+RMD160 (mksh-R29e.cpio.gz) = d334382380ae088bc007d7b536e3c7a899298921
+SHA1 (mksh-R29e.cpio.gz) = 5012ebb4a5e2cb811467e600ff8ffcb87aa3a8e3
+SHA256 (mksh-R29e.cpio.gz) = 4e42319688403e2f2d7efd06043adb494bc2694d468c49fcdeea58aff8b6ee3c
+Size (mksh-R29e.cpio.gz) = 240688 bytes
+TIGER (mksh-R29e.cpio.gz) = b6940244d484d0cef7a3545a38fe642ddc2ba124a6a80118
-- 
cgit v1.2.3