Re: CVS commit: pkgsrc/devel/libuuid

[maya%netbsd.org@localhost]

On Sun, Nov 04, 2018 at 06:02:47PM +0000, maya%netbsd.org@localhost wrote:
> On Sun, Nov 04, 2018 at 04:51:31PM +0000, Benny Siegert wrote:
> > Module Name:        pkgsrc
> > Committed By:       bsiegert
> > Date:               Sun Nov  4 16:51:31 UTC 2018
> > 
> > Modified Files:
> >     pkgsrc/devel/libuuid: Makefile.common
> > 
> > Log Message:
> > Only configure libuuid using ksh on NetBSD 6.
> > 
> > The build of ksh is all but broken on modern systems. PR pkg/52877
> > introduced ksh as CONFIGURE_SHELL to fix NetBSD 6, but this causes issues
> > on NetBSD-8 and later (PR pkg/53686). Arguably, the workaround could be
> > dropped, since we stopped supporting NetBSD 6.
> > 
> > Fix proposed by David H. Gutteridge, thanks!
> 
> We pick ksh in a lot of places as an alternative shell, not just here.
> That's because it doesn't use pdksh in most cases but a shell from base.

This changes it to mksh in tools, but not in bootstrap which is more
risky because there's like AIX and weird things I could never test
I didn't test it though

Index: tools/replace.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/replace.mk,v
retrieving revision 1.285
diff -u -r1.285 replace.mk
--- tools/replace.mk    17 Oct 2018 08:22:19 -0000      1.285
+++ tools/replace.mk    4 Nov 2018 18:10:17 -0000
@@ -511,12 +511,12 @@
 TOOLS_SCRIPT.install-info=     exit 0
 
 .if !defined(TOOLS_IGNORE.ksh) && !empty(_USE_TOOLS:Mksh)
-.  if !empty(PKGPATH:Mshells/pdksh)
+.  if !empty(PKGPATH:Mshells/mksh)
 MAKEFLAGS+=                    TOOLS_IGNORE.ksh=
 .  elif !empty(_TOOLS_USE_PKGSRC.ksh:M[yY][eE][sS])
-TOOLS_DEPENDS.ksh?=            pdksh>=5.2.14:../../shells/pdksh
+TOOLS_DEPENDS.ksh?=            mksh-[0-9]*:../../shells/mksh
 TOOLS_CREATE+=                 ksh
-TOOLS_PATH.ksh=                        ${LOCALBASE}/bin/pdksh
+TOOLS_PATH.ksh=                        ${LOCALBASE}/bin/mksh
 .  endif
 .endif
 
@@ -693,12 +693,12 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.sh) && !empty(_USE_TOOLS:Msh)
-.  if !empty(PKGPATH:Mshells/pdksh)
+.  if !empty(PKGPATH:Mshells/mksh)
 MAKEFLAGS+=                    TOOLS_IGNORE.sh=
 .  elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
-TOOLS_DEPENDS.sh?=             pdksh>=5.2.14:../../shells/pdksh
+TOOLS_DEPENDS.sh?=             mksh-[0-9]*:../../shells/mksh
 TOOLS_CREATE+=                 sh
-TOOLS_PATH.sh=                 ${LOCALBASE}/bin/pdksh
+TOOLS_PATH.sh=                 ${LOCALBASE}/bin/mksh
 .  endif
 TOOLS_CMD.sh=                  ${TOOLS_DIR}/bin/sh
 .endif