Replace pdksh by mksh when bootstraping

bootstrap/bootstrap

@@ -1112,18 +1112,19 @@ run_cmd "(cd $wrkdir/libnbcompat; $shprog ./configure $configure_quiet_flags -C
 
 # bootstrap ksh if necessary
 case "$need_ksh" in
-yes)	echo_msg "Bootstrapping ksh"
-	copy_src $pkgsrcdir/shells/pdksh/files ksh
-	test -n "$CC" || CC=gcc	# default to gcc if no compiler is specified
-	run_cmd "(cd $wrkdir/ksh && env $BSTRAP_ENV $shprog ./configure $configure_quiet_flags --prefix=$prefix --infodir=$infodir --mandir=$mandir --sysconfdir=$sysconfdir && $bmake -j$make_jobs)"
-	run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/ksh/ksh $wrkdir/bin/pdksh"
-	echo "TOOLS_PLATFORM.sh?=		$prefix/bin/pdksh" >> ${TARGET_MKCONF}
-	echo "TOOLS_PLATFORM.sh?=		$wrkdir/bin/pdksh" >> ${BOOTSTRAP_MKCONF}
-	echo "TOOLS_PLATFORM.ksh?=		$prefix/bin/pdksh" >> ${TARGET_MKCONF}
-	echo "TOOLS_PLATFORM.ksh?=		$wrkdir/bin/pdksh" >> ${BOOTSTRAP_MKCONF}
+yes) echo_msg "Bootstrapping ksh"
+	copy_src $pkgsrcdir/shells/mksh/files ksh
+	test -n "$CC" || CC=gcc # default to gcc if no compiler is specified
+	mksh_para=""; test $make_jobs -lt 2 || mksh_para="-j"
+	run_cmd "(cd $wrkdir/ksh && env $BSTRAP_ENV $shprog ./Build.sh -r $mksh_para)"
+	run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/ksh/mksh $wrkdir/bin/mksh"
+	echo "TOOLS_PLATFORM.sh?= $prefix/bin/mksh" >> ${TARGET_MKCONF}
+	echo "TOOLS_PLATFORM.sh?= $wrkdir/bin/mksh" >> ${BOOTSTRAP_MKCONF}
+	echo "TOOLS_PLATFORM.ksh?= $prefix/bin/mksh" >> ${TARGET_MKCONF}
+	echo "TOOLS_PLATFORM.ksh?= $wrkdir/bin/mksh" >> ${BOOTSTRAP_MKCONF}
 # Now rebootstrap bmake for ksh
 	echo_msg "Rebootstrapping bmake for ksh"
-	bmakexargs="$bmakexargs --with-defshell=$wrkdir/bin/pdksh"
+	bmakexargs="$bmakexargs --with-defshell=$wrkdir/bin/mksh"
 	bootstrap_bmake
 	;;
 esac
@@ -1255,7 +1256,7 @@ yes)
 	;;
 esac
 case "$need_ksh" in
-yes)	build_package "shells/pdksh";;
+yes)	build_package "shells/mksh";;
 esac
 build_package "devel/bmake"
 case "$need_awk" in

devel/bmake/Makefile

@@ -32,8 +32,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*) && exists(/usr/bin/bash)
-CONFIGURE_ARGS+=	--with-defshell=/usr/bin/bash
+.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
+DEPENDS+= mksh-[0-9]*:../../shells/mksh
+CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/mksh
 .elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "IRIX"
 DEPENDS+=		pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=	--with-defshell=${PREFIX}/bin/pdksh

shells/mksh/Makefile

@@ -1,34 +1,30 @@
 # $NetBSD: Makefile,v 1.30 2014/11/27 13:38:15 joerg Exp $
 
-DISTNAME=			mksh-R50d
-PKGNAME=			${DISTNAME:S/-R/-/}
+DISTNAME=			mksh-R50e
 CATEGORIES=			shells
-MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
-				http://pub.allbsd.org/MirOS/dist/mir/mksh/
-SITES.${DISTNAME}.cat1.gz=	${MASTER_SITES:S/dist/cats/}
-
-EXTRACT_SUFX=			.tgz
+MASTER_SITES=			# maintained locally
+DISTFILES=			# maintained locally
 
 MAINTAINER=			[email protected]
 HOMEPAGE=			http://mirbsd.de/mksh
 COMMENT=			MirBSD Korn Shell
 LICENSE=			miros
 
-WRKSRC=				${WRKDIR}/mksh
-WRKBUILD?=			${WRKSRC}
-
 PKG_SHELL=			bin/mksh
 
 LIBS.Interix+=			-lcrypt
 
 INSTALLATION_DIRS=		bin ${PKGMANDIR}/man1 share/examples/mksh
 
+do-extract:
+	${CP} -R ${FILESDIR} ${WRKSRC}
+
 do-build:
-	cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} LIBS=${LIBS:Q} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LIBS=${LIBS:Q} \
 	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${DESTDIR}${PREFIX}/bin/mksh
+	${INSTALL_PROGRAM} ${WRKSRC}/mksh ${DESTDIR}${PREFIX}/bin/mksh
 	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${DESTDIR}${PREFIX}/share/examples/mksh/