Subject: please test and commit: second upgrade for pkgsrc/shells/mksh
To: None <pkgsrc-users@netbsd.org>
From: Thorsten Glaser <tg@mirbsd.de>
List: pkgsrc-users
Date: 03/11/2007 01:47:11
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 =E2=80=9Cmake test=E2=80=9D) 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:/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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/shells/mksh/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- DESCR=0915 Sep 2006 13:00:37 -0000=091.1.1.1
+++ DESCR=0911 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/shells/mksh/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile=0922 Feb 2007 19:01:24 -0000=091.2
+++ Makefile=0911 Mar 2007 01:45:47 -0000
@@ -1,13 +1,15 @@
 # $NetBSD: Makefile,v 1.2 2007/02/22 19:01:24 wiz Exp $
=20
-DISTNAME=3D=09=09=09mksh-R28
-PKGNAME=3D=09=09=09mksh-28
+DISTNAME=3D=09=09=09mksh-R29b
+PKGNAME=3D=09=09=09mksh-29.1
 CATEGORIES=3D=09=09=09shells
-MASTER_SITES=3D=09=09=09http://www.mirbsd.org/MirOS/dist/mir/mksh/
+MASTER_SITES=3D=09=09=09http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
+=09=09=09=09http://pub.allbsd.org/MirOS/dist/mir/mksh/
 EXTRACT_SUFX=3D=09=09=09.cpio.gz
+USE_TOOLS+=3D=09=09=09gzcat tar
=20
 MAINTAINER=3D=09=09=09pkgsrc-users@NetBSD.org
-HOMEPAGE=3D=09=09=09http://www.mirbsd.de/?mksh
+HOMEPAGE=3D=09=09=09http://mirbsd.de/mksh
 COMMENT=3D=09=09=09MirBSD Korn Shell
=20
 WRKSRC=3D=09=09=09=09${WRKDIR}/mksh
@@ -24,8 +26,10 @@
=20
 .include "../../mk/bsd.options.mk"
=20
-.if !empty(PKG_OPTIONS:Mstatic)
-LDFLAGS+=3D=09=09=09-static
+BUILD_PARMS=3D=09=09=09-r=09# don't call nRoff
+
+.if empty(PKG_OPTIONS:Mstatic)
+BUILD_PARMS+=3D=09=09=09-d=09# build Dynamically
 .endif
=20
 LIBS+=3D=09=09=09=09${LDADD}
@@ -33,7 +37,11 @@
 LIBS+=3D=09=09=09=09-lcrypt
 .endif
=20
-INSTALLATION_DIRS=3D=09bin ${PKGMANDIR}/man1 share/examples/mksh
+INSTALLATION_DIRS=3D=09=09bin ${PKGMANDIR}/man1 share/examples/mksh
+
+do-extract: ${WRKDIR}
+=09${_PKG_SILENT}${_PKG_DEBUG} cd ${WRKDIR}; \
+=09    ${GZCAT} ${_DISTDIR}/${EXTRACT_ONLY} | ${TAR} -xf -
=20
 do-build:
 =09cd ${WRKBUILD} && LIBS=3D${LIBS:Q} CC=3D${CC:Q} CFLAGS=3D${CFLAGS:Q} \
@@ -42,8 +50,8 @@
=20
 do-install:
 =09${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${PREFIX}/bin/mksh
-=09${INSTALL_MAN} ${WRKSRC}/mksh.1 ${PREFIX}/${PKGMANDIR}/man1
-=09${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${PREFIX}/share/examples/mksh
+=09${INSTALL_MAN} ${WRKSRC}/mksh.1 ${PREFIX}/${PKGMANDIR}/man1/
+=09${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${PREFIX}/share/examples/mksh/
=20
 #USE_TOOLS+=3D=09=09=09ed:test perl:test
 #do-test:
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/shells/mksh/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo=0915 Sep 2006 13:00:37 -0000=091.1.1.1
+++ distinfo=0911 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 $
=20
-SHA1 (mksh-R28.cpio.gz) =3D 857c03be697434e36cc1663f2d1657c1eff3ae6c
-RMD160 (mksh-R28.cpio.gz) =3D 511926e621b73be23e0ae48fe1c09c2e1bfa7500
-Size (mksh-R28.cpio.gz) =3D 230291 bytes
+MD5 (mksh-R29b.cpio.gz) =3D a21850403bd30bab461f2fc9f9b803b8
+RMD160 (mksh-R29b.cpio.gz) =3D a329df3c012819dc5fb593dda5d9a52951bda81b
+SHA1 (mksh-R29b.cpio.gz) =3D 8a95d03a3241ce50baf197432bd7254c4b5800ab
+Size (mksh-R29b.cpio.gz) =3D 238113 bytes
+TIGER (mksh-R29b.cpio.gz) =3D c8325f9f06ece7ee50453c6915dc0dd94d45a45708f3=
6512


bye,
//mirabile
--=20
  "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