From 2fe11c981105423d1371f4a434f6082440d7790d Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 12 Feb 2013 22:32:39 +0000
Subject: [PATCH] - correctly pass SMLNJ_HOME around, unbreaking some scripts.

from Alexander Polakov
ok sthen@
---
 lang/smlnj/Makefile                            | 6 +++++-
 lang/smlnj/patches/patch-config__arch-n-opsys  | 9 +++++++++
 lang/smlnj/patches/patch-config__heap2exec     | 9 +++++++++
 lang/smlnj/patches/patch-config__link-sml      | 9 +++++++++
 lang/smlnj/patches/patch-config__ml-build      | 9 +++++++++
 lang/smlnj/patches/patch-config__ml-makedepend | 9 +++++++++
 lang/smlnj/patches/patch-config__run-sml       | 9 +++++++++
 7 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 lang/smlnj/patches/patch-config__arch-n-opsys
 create mode 100644 lang/smlnj/patches/patch-config__heap2exec
 create mode 100644 lang/smlnj/patches/patch-config__link-sml
 create mode 100644 lang/smlnj/patches/patch-config__ml-build
 create mode 100644 lang/smlnj/patches/patch-config__ml-makedepend
 create mode 100644 lang/smlnj/patches/patch-config__run-sml

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 91f52fa49de..cc6097938e6 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2013/01/16 12:20:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2013/02/12 22:32:39 jasper Exp $
 
 ONLY_FOR_ARCHS=i386
 
 COMMENT=	New Jersey Standard ML
 
 V=		110.75
+REVISION= 	0
 
 PKGNAME=	smlnj-$V
 CATEGORIES=	lang
@@ -52,6 +53,9 @@ post-extract:
 
 do-build:
 	cd ${WRKDIR} && unset PWD && \
+	for file in "config/_*"; do  \
+		${SUBST_CMD} ${WRKDIR}/$$file; \
+	done; \
 	FILESDIR="$(FILESDIR)" ./config/install.sh
 
 do-install:
diff --git a/lang/smlnj/patches/patch-config__arch-n-opsys b/lang/smlnj/patches/patch-config__arch-n-opsys
new file mode 100644
index 00000000000..af1adb6f541
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__arch-n-opsys
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__arch-n-opsys,v 1.3 2013/02/12 22:32:39 jasper Exp $
+--- config/_arch-n-opsys.orig	Sat Jul 28 07:32:38 2012
++++ config/_arch-n-opsys	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ #
+ # .arch-n-opsys  -- get architecture and system info
+ #
diff --git a/lang/smlnj/patches/patch-config__heap2exec b/lang/smlnj/patches/patch-config__heap2exec
new file mode 100644
index 00000000000..0e61e5a6160
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__heap2exec
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__heap2exec,v 1.1 2013/02/12 22:32:39 jasper Exp $
+--- config/_heap2exec.orig	Thu Apr 20 19:28:53 2006
++++ config/_heap2exec	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ 
+ CMD=`basename "$0"`
+ 
diff --git a/lang/smlnj/patches/patch-config__link-sml b/lang/smlnj/patches/patch-config__link-sml
new file mode 100644
index 00000000000..4ff373b9eb0
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__link-sml
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__link-sml,v 1.1 2013/02/12 22:32:39 jasper Exp $
+--- config/_link-sml.orig	Tue Jan  4 00:13:16 2005
++++ config/_link-sml	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ #
+ # The standard "link" script for SML/NJ
+ #
diff --git a/lang/smlnj/patches/patch-config__ml-build b/lang/smlnj/patches/patch-config__ml-build
new file mode 100644
index 00000000000..cc3cd5dbbf6
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__ml-build
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__ml-build,v 1.1 2013/02/12 22:32:39 jasper Exp $
+--- config/_ml-build.orig	Tue Feb 13 00:05:27 2007
++++ config/_ml-build	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ 
+ if [ x${SMLNJ_HOME} = x ] ; then
+     BIN_DIR="@BINDIR@"
diff --git a/lang/smlnj/patches/patch-config__ml-makedepend b/lang/smlnj/patches/patch-config__ml-makedepend
new file mode 100644
index 00000000000..d0d2721d4a4
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__ml-makedepend
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__ml-makedepend,v 1.1 2013/02/12 22:32:39 jasper Exp $
+--- config/_ml-makedepend.orig	Thu Mar 27 22:23:09 2008
++++ config/_ml-makedepend	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ 
+ if [ x${SMLNJ_HOME} = x ] ; then
+     BIN_DIR="@BINDIR@"
diff --git a/lang/smlnj/patches/patch-config__run-sml b/lang/smlnj/patches/patch-config__run-sml
new file mode 100644
index 00000000000..56001e35785
--- /dev/null
+++ b/lang/smlnj/patches/patch-config__run-sml
@@ -0,0 +1,9 @@
+$OpenBSD: patch-config__run-sml,v 1.1 2013/02/12 22:32:39 jasper Exp $
+--- config/_run-sml.orig	Fri May 13 23:34:14 2011
++++ config/_run-sml	Tue Feb 12 23:18:58 2013
+@@ -1,4 +1,5 @@
+ #!@SHELL@
++SMLNJ_HOME=${TRUEPREFIX}/smlnj
+ #
+ # The standard driver for SML/NJ under the new runtime system
+ #