Honor the pkgsrc configure shell instead of using /bin/sh, as on some

platforms /bin/sh gets one something uselessly broken.

Also, don't set MAKE to Solaris's make on Solaris; while this might be
necessary building standalone, in pkgsrc it's foolish.

3 files changed, 38 insertions, 10 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 387b184a1d4..71a97cc41b7 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $
+# $NetBSD: Makefile,v 1.30 2016/07/03 19:18:46 dholland Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
@@ -118,13 +118,21 @@ SUBST_MESSAGE.cflags=	Setting CFLAGS
 SUBST_FILES.cflags=	src/runtime/objs/* base/runtime/objs/*
 SUBST_VARS.cflags=	CFLAGS
 
+# use the proper shell
+SUBST_CLASSES+=		shell
+SUBST_STAGE.shell=	pre-configure
+SUBST_MESSAGE.shell=	Choosing the right shell
+SUBST_FILES.shell=	config/install.sh
+SUBST_VARS.shell=	CONFIG_SHELL
+
 # nothing here any more
 do-configure:
 	${DO_NADA}
 
 # The build target needs to run $WRKDIR/config/install.sh
 do-build:
-	cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh
+	cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \
+		${CONFIG_SHELL} ./config/install.sh
 
 # install target
 # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo
index 2928891c03e..f0650c112c8 100644
--- a/lang/smlnj/distinfo
+++ b/lang/smlnj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2016/07/03 19:07:38 dholland Exp $
+$NetBSD: distinfo,v 1.21 2016/07/03 19:18:46 dholland Exp $
 
 SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9
 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb
@@ -95,7 +95,7 @@ SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7
 SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
 SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b
 SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059
-SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae
+SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c
 SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c
 SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
 SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
diff --git a/lang/smlnj/patches/patch-at b/lang/smlnj/patches/patch-at
index db5f9e95c13..0f342a60fc5 100644
--- a/lang/smlnj/patches/patch-at
+++ b/lang/smlnj/patches/patch-at
@@ -1,11 +1,31 @@
-$NetBSD: patch-at,v 1.2 2012/01/29 20:48:48 asau Exp $
+$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $
 
-Don't unpack archive, since it is hard to fix,
-unpack before patch phase instead.
+- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris.
+- Don't use solaris make.
+- Don't untar the runtime here since we did it from the pkgsrc makefile.
 
---- config/install.sh.orig	2007-06-12 20:43:58.000000000 +0400
-+++ config/install.sh	2009-03-19 00:47:06.000000000 +0300
-@@ -316,7 +316,7 @@
+--- config/install.sh.orig	2011-05-16 21:13:32.000000000 +0000
++++ config/install.sh
+@@ -55,7 +55,7 @@ cp config/preloads preloads.standard
+ #
+ MAKE=make
+ 
+-SHELL=/bin/sh
++SHELL=@CONFIG_SHELL@
+ vsay $this: Using shell $SHELL.
+ 
+ #
+@@ -291,7 +291,8 @@ esac
+ 
+ case $OPSYS in
+     solaris)
+-	MAKE=/usr/ccs/bin/make
++	# not in pkgsrc!
++	#MAKE=/usr/ccs/bin/make
+ 	;;
+     linux)
+ 	EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"`
+@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE
  if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
      vsay $this: Run-time system already exists.
  else