please test and commit: second upgrade for pkgsrc/shells/mksh

[Thorsten Glaser <tg%mirbsd.de@localhost>]

Hi everyone,

seems as if the stuff from the last mail got no feedback; here's
an updated diff against anoncvs.netbsd.org from just now.

Changelog: http://www.mirbsd.org/?mksh#clog -> bug fixes

This time, it was actually tested (including uncommenting the
do-test stuff and doing a “make test”) on a real system:
$ uname -a
NetBSD ip54532528.speed.planet.nl 3.0_STABLE NetBSD 3.0_STABLE (GENERIC) #0: 
Wed Jan 11 19:40:54 UTC 2006  
netbsdbuilder%draco.osr.netphreax.net@localhost:/stor/builds/netbsd/netbsd-3/src/sys/arch/i386/compile/obj/GENERIC
 i386
I've built it as non-root, but it seemed to work fine.

Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/shells/mksh/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- DESCR       15 Sep 2006 13:00:37 -0000      1.1.1.1
+++ DESCR       11 Mar 2007 01:13:27 -0000
@@ -2,4 +2,10 @@ mksh is the MirBSD enhanced version of t
 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.
+
+A sample ~/.mkshrc is included in ${PREFIX}/share/examples/mksh/
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/mksh/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    22 Feb 2007 19:01:24 -0000      1.2
+++ Makefile    11 Mar 2007 01:45:47 -0000
@@ -1,13 +1,15 @@
 # $NetBSD: Makefile,v 1.2 2007/02/22 19:01:24 wiz Exp $
 
-DISTNAME=                      mksh-R28
-PKGNAME=                       mksh-28
+DISTNAME=                      mksh-R29b
+PKGNAME=                       mksh-29.1
 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
+USE_TOOLS+=                    gzcat tar
 
 MAINTAINER=                    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=                      http://www.mirbsd.de/?mksh
+HOMEPAGE=                      http://mirbsd.de/mksh
 COMMENT=                       MirBSD Korn Shell
 
 WRKSRC=                                ${WRKDIR}/mksh
@@ -24,8 +26,10 @@
 
 .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
 .endif
 
 LIBS+=                         ${LDADD}
@@ -33,7 +37,11 @@
 LIBS+=                         -lcrypt
 .endif
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/mksh
+INSTALLATION_DIRS=             bin ${PKGMANDIR}/man1 share/examples/mksh
+
+do-extract: ${WRKDIR}
+       ${_PKG_SILENT}${_PKG_DEBUG} cd ${WRKDIR}; \
+           ${GZCAT} ${_DISTDIR}/${EXTRACT_ONLY} | ${TAR} -xf -
 
 do-build:
        cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
@@ -42,8 +50,8 @@
 
 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_MAN} ${WRKSRC}/mksh.1 ${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${PREFIX}/share/examples/mksh/
 
 #USE_TOOLS+=                   ed:test perl:test
 #do-test:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/shells/mksh/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    15 Sep 2006 13:00:37 -0000      1.1.1.1
+++ distinfo    11 Mar 2007 01:13:27 -0000
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.1.1.1 2006/09/15 13:00:37 joerg Exp $
 
-SHA1 (mksh-R28.cpio.gz) = 857c03be697434e36cc1663f2d1657c1eff3ae6c
-RMD160 (mksh-R28.cpio.gz) = 511926e621b73be23e0ae48fe1c09c2e1bfa7500
-Size (mksh-R28.cpio.gz) = 230291 bytes
+MD5 (mksh-R29b.cpio.gz) = a21850403bd30bab461f2fc9f9b803b8
+RMD160 (mksh-R29b.cpio.gz) = a329df3c012819dc5fb593dda5d9a52951bda81b
+SHA1 (mksh-R29b.cpio.gz) = 8a95d03a3241ce50baf197432bd7254c4b5800ab
+Size (mksh-R29b.cpio.gz) = 238113 bytes
+TIGER (mksh-R29b.cpio.gz) = c8325f9f06ece7ee50453c6915dc0dd94d45a45708f36512


bye,
//mirabile
-- 
  "Using Lynx is like wearing a really good pair of shades: cuts out
   the glare and harmful UV (ultra-vanity), and you feel so-o-o COOL."
                                         -- Henry Nelson, March 1999