diff options
Diffstat (limited to 'lang/smlnj/patches/patch-at')
| -rw-r--r-- | lang/smlnj/patches/patch-at | 32 |
1 files changed, 26 insertions, 6 deletions
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 |