CVS commit: pkgsrc/shells

["Andrew Doran" <ad%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ad
Date:           Fri Apr 17 21:28:01 UTC 2020

Modified Files:
        pkgsrc/shells/ast-ksh: Makefile.common
        pkgsrc/shells/static-ast-ksh: Makefile

Log Message:
Get ast-ksh building again on NetBSD, at least on amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/shells/ast-ksh/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/shells/static-ast-ksh/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/ast-ksh/Makefile.common
diff -u pkgsrc/shells/ast-ksh/Makefile.common:1.35 pkgsrc/shells/ast-ksh/Makefile.common:1.36
--- pkgsrc/shells/ast-ksh/Makefile.common:1.35  Sun Feb 19 20:18:16 2017
+++ pkgsrc/shells/ast-ksh/Makefile.common       Fri Apr 17 21:28:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2017/02/19 20:18:16 maya Exp $
+# $NetBSD: Makefile.common,v 1.36 2020/04/17 21:28:01 ad Exp $
 #
 # used by shells/ast-ksh/Makefile
 # used by shells/static-ast-ksh/Makefile
@@ -16,6 +16,8 @@ HOMEPAGE=     http://www.kornshell.com/
 COMMENT=       Official AT&T release of KornShell 93
 LICENSE=       epl-v1.0
 
+USE_TOOLS=     bash
+
 NOT_FOR_PLATFORM=      Interix-*-* # taking nearly a day to build and crash!
 
 CONFLICTS=     static-ast-ksh-[0-9]*
@@ -29,7 +31,9 @@ MAKE_FLAGS+=  CC=${CC:Q} CCFLAGS=${CFLAGS
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-PDKSH=         /bin/ksh
+PDKSH=                 ${TOOLS_PATH.bash}
+KSH93_MAKEFLAGS+=      "SHELL=${PDKSH}"
+KSH93_MAKEFLAGS+=      "CCFLAGS=-D_NETBSD_SOURCE"
 .endif
 
 # Link with libm to fix sfcvt link error -

Index: pkgsrc/shells/static-ast-ksh/Makefile
diff -u pkgsrc/shells/static-ast-ksh/Makefile:1.15 pkgsrc/shells/static-ast-ksh/Makefile:1.16
--- pkgsrc/shells/static-ast-ksh/Makefile:1.15  Mon Nov  4 21:14:07 2019
+++ pkgsrc/shells/static-ast-ksh/Makefile       Fri Apr 17 21:28:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/11/04 21:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/04/17 21:28:01 ad Exp $
 #
 
 .include "../../shells/ast-ksh/Makefile.common"
@@ -17,6 +17,6 @@ COMMENT:=     Statically-linked version of t
 # SunOS 5.10 stopped shipping static libraries
 NOT_FOR_PLATFORM+=     SunOS-5.1[0-9]-*
 
-KSH93_MAKEFLAGS=       LDFLAGS=-static
+KSH93_MAKEFLAGS+=      LDFLAGS=-static
 
 .include "../../mk/bsd.pkg.mk"