Attachment #147015 for bug #193431

View | Details | Raw Unified | Return to bug 193431
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	smlnj
PORTVERSION=	110.77
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/

MLARCH=		x86
DISTFILES+=	boot.x86-unix.tgz
.endif
DISTFILES+=	MLRISC.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \
		ml-burg.tgz ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \
		smlnj-lib.tgz trace-debug-profile.tgz

PLIST_SUB=	MLARCH=${MLARCH}

MLBINRELATIVE=	${MLROOTRELATIVE}/bin
MLBIN=		${MLROOT}/bin
MLLIB=		${MLROOT}/lib
MLSTDSRCDIRS=	cml doc heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-lib
MLSRCDIRS=	base ${MLSTDSRCDIRS} \
		ckit eXene pgraph smlnj-c
MLSRCS=

	./config/install.sh
.endif

# If Mac OS X resource files make it into the distribution tarballs,
# then we have to remove them at several points during the
# installation process. This is no longer necessary with FreeBSD 10
# as it uses libarchive 3.x (via bsdtar), but earlier versions
# don't ignore such resource files and hence WRKDIR and STAGEDIR
# are full of them. Once FreeBSD 9 will be out of service, all
# lines in this Makefile can be removed which contain a pattern
# for the prefix "._" of the resource files. Background information:
# <https://github.com/libarchive/libarchive/wiki/TarExtendedAttributes#Apple_tar>

post-build:
	${FIND} ${WRKDIR} -type f -name '\._*' -delete

# Nowadays PLIST has to be computed before installation. We do it in
# "pre-install" because source extraction happens during "build".


.if defined(ML_EVERYTHING)
	@${ECHO} -n '(* Computing package list ...'
	@${TAR} -tzf ${WRKDIR}/runtime.tgz | \
	${GREP} -E -v '(^|/)\._.*' | \
	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
		> ${MLRUNTIMEPLIST}

	CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \
	./config/install.sh
.endif
	[ ! -d ${STAGEDIR} ] || \
	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
	@${ECHO} '(* Installing man pages. *)'
.for mansect in 1 2 3 4 5 6 7 8 9
	@[ ! -d ${WRKDIR}/doc/man/man${mansect} ] || \
	{ cd ${WRKDIR}/doc/man/man${mansect} && ls *.${mansect} | \
	  ${XARGS} -J % \
	    ${INSTALL_MAN} % ${STAGEDIR}${MANPREFIX}/man/man${mansect} ; }
.endfor
	@${ECHO} '(* Stripping runtime executable: *)'
	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
	( eval $${MLARCHOPSYS} ; \
	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )

.endif

post-stage:
	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
	@${ECHO} '(* Stripping runtime executable: *)'
	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
	( eval $${MLARCHOPSYS} ; \
	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )

.ifndef MULTIEXEC_WRAPPER_VERBOSE
deinstall:




SHA256 (smlnj/110.77/MLRISC.tgz) = 4b443ee9e27bc8d2010bdce5724302c7d338e8eba0051d45cb4e384204488a76
SIZE (smlnj/110.77/MLRISC.tgz) = 1479104
SHA256 (smlnj/110.77/boot.x86-unix.tgz) = 9982a36d9fb3d2d15590d0d8bb15a30d3e684ad49f56d69eef8684f4eaf3bf02
SIZE (smlnj/110.77/boot.x86-unix.tgz) = 5905482
SHA256 (smlnj/110.77/ckit.tgz) = 29145b1739d46173cbaa87456b2bed35977c4ae7e83c48134a591459939b3966
SIZE (smlnj/110.77/ckit.tgz) = 206672
SHA256 (smlnj/110.77/cm.tgz) = 1c60316b3f16ae1a93cb87e281edcf2a84a554ac0415f010b8d565c2ae3a0a82
SIZE (smlnj/110.77/cm.tgz) = 209949
SHA256 (smlnj/110.77/cml.tgz) = bc4548eda9531c52029ed68a7988985b62ad17e95841c04dbbe32b4b30df4ef7
SIZE (smlnj/110.77/cml.tgz) = 119083
SHA256 (smlnj/110.77/compiler.tgz) = fcc7388167ee2d0048644bb2147bbca3e16f60be326dd724407e0f51e254e52f
SIZE (smlnj/110.77/compiler.tgz) = 841677
SHA256 (smlnj/110.77/config.tgz) = 6bed2026e05367f247e2fcfa918edb835bdab24182f02f3253c1baf2f301b552
SIZE (smlnj/110.77/config.tgz) = 514900
SHA256 (smlnj/110.77/doc.tgz) = 8301bccdc1e99e8865e905070f7719d94a0ae39b44733d961a3e3002d97dd27e
SIZE (smlnj/110.77/doc.tgz) = 10240
SHA256 (smlnj/110.77/eXene.tgz) = d4d3ccbde1bc11943054fb093a34c8531c9e8f56731293ca2470eab21602ea33
SIZE (smlnj/110.77/eXene.tgz) = 729294
SHA256 (smlnj/110.77/heap2asm.tgz) = f3f5c26d11dbe8019e6b3349ab07c04ffe553780a3a6ca0b000fe8084886ada5
SIZE (smlnj/110.77/heap2asm.tgz) = 1606
SHA256 (smlnj/110.77/ml-burg.tgz) = 9bc7bb014d34a63cb3ac8c42104bd579e8990ab2803c32a6a4410fcf8cfcbd4c
SIZE (smlnj/110.77/ml-burg.tgz) = 37604
SHA256 (smlnj/110.77/ml-lex.tgz) = c4c0e108bf166f77e083692a27f9231d730c5b2a73a2f9f5409e55928c679553
SIZE (smlnj/110.77/ml-lex.tgz) = 34081
SHA256 (smlnj/110.77/ml-lpt.tgz) = eff30e6a3c4afb7f8265650e3e1cc83a8ff252ed19f22b30c2c431c9beca126e
SIZE (smlnj/110.77/ml-lpt.tgz) = 266511
SHA256 (smlnj/110.77/ml-yacc.tgz) = 24a2b1d955e990c6f2a64d6be4df0c7d9bf430f56501587ecf95d30732cf266c
SIZE (smlnj/110.77/ml-yacc.tgz) = 103554
SHA256 (smlnj/110.77/nlffi.tgz) = 8729d2aa203329fa76f9a7dccafe6fe88d0f397f1238727fea8fa1c67ae38cf0
SIZE (smlnj/110.77/nlffi.tgz) = 79026
SHA256 (smlnj/110.77/pgraph.tgz) = 5b46d4d9668f27b7538b5a8f6b62d9cd2c5797118e303aa691266df67f6e818c
SIZE (smlnj/110.77/pgraph.tgz) = 5907
SHA256 (smlnj/110.77/runtime.tgz) = 8e40aa7d39c806d36360174d36bc376fa53662b5ac4f0a4add120c8c2fe67f2b
SIZE (smlnj/110.77/runtime.tgz) = 349470
SHA256 (smlnj/110.77/smlnj-c.tgz) = 6de6f0d5a41e7fe097f3fae2815829c4bb14729145efa293fc74bd138180f01d
SIZE (smlnj/110.77/smlnj-c.tgz) = 11462
SHA256 (smlnj/110.77/smlnj-lib.tgz) = 9232f7cf61a9a7a859dc9249a47a77b954a746137e8d8f6e57236f8c030677e7
SIZE (smlnj/110.77/smlnj-lib.tgz) = 434946
SHA256 (smlnj/110.77/system.tgz) = 367cce5e0ab848d28bc019862a30c2b5b774fd4733301bb72fec811d8e9d7f54
SIZE (smlnj/110.77/system.tgz) = 246164
SHA256 (smlnj/110.77/trace-debug-profile.tgz) = e6c7a4ed96de076b8d27af44eb8bfc1121e32f915d9a0b8fc356b5a27c761908
SIZE (smlnj/110.77/trace-debug-profile.tgz) = 4329




--- base/runtime/c-libs/posix-os/tmpname.c.orig	2000-06-01 20:34:03.000000000 +0200
+++ base/runtime/c-libs/posix-os/tmpname.c	2014-08-01 16:35:28.000000000 +0200
@@ -4,8 +4,11 @@
  */
 
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include "ml-base.h"
 #include "ml-values.h"
+#include "ml-c.h"
 #include "ml-objects.h"
 #include "cfun-proto-list.h"
 
@@ -13,9 +16,18 @@
  */
 ml_val_t _ml_OS_tmpname (ml_state_t *msp, ml_val_t arg)
 {
-    char	buf[L_tmpnam];
-
-    tmpnam (buf);
+    char	template[] = "/tmp/TMP-SMLNJ.XXXXXX";
+    char	buf[sizeof(template)];
+    int		fd;
+
+    strcpy (buf, template);
+
+    fd = mkstemp (buf);
+
+    if (fd == -1)
+	return RAISE_SYSERR(msp, -1);
+    else
+	close (fd);
 
     return ML_CString (msp, buf);
 




--- base/runtime/include/ml-unixdep.h.orig	2014-08-17 21:09:56.000000000 +0200
+++ base/runtime/include/ml-unixdep.h	2014-08-23 22:24:36.475122070 +0200
@@ -33,6 +33,7 @@
  *   HAS_UCONTEXT		if signal handlers have a ucontext_t argument.
  *   HAS_STRERROR		if the system provides the ISO C strerror function.
  *   INT_GIDLIST		if the second argument to getgroups is int[].
+ *   HAS_MKSTEMP		if OS provides the POSIX mkstemp function.
  *
  * Note that only one of the following sets of symbols should be defined:
  *   { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }
@@ -295,6 +296,7 @@
 #  define HAS_ILOGB
 #  define HAS_SIGCONTEXT
 #  define HAS_STRERROR
+#  define HAS_MKSTEMP
 
 /* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */
 #  define MAP_ANONYMOUS MAP_ANON
@@ -377,6 +379,15 @@
 #  define __EXTENSIONS__
 #endif
 
+#if defined(OPSYS_FREEBSD)
+#  if defined(INCLUDE_FREEBSD_I386__TYPES)
+#    include <sys/cdefs.h>
+#    include INCLUDE_FREEBSD_I386__TYPES
+#  endif
+#  if defined(INCLUDE_FREEBSD_I386_SIGNAL)
+#    include INCLUDE_FREEBSD_I386_SIGNAL
+#  endif
+#endif
 #include INCLUDE_TYPES_H
 #include <unistd.h>
 #include <string.h>




--- base/system/smlnj/installer/generic-install.sml.orig	2014-08-23 04:18:09.000000000 +0200
+++ base/system/smlnj/installer/generic-install.sml	2014-08-28 21:51:06.000000000 +0200
@@ -233,28 +233,26 @@
 	(* ------------------------------ *)
 
 	(* parse the targets file *)
-	fun loop (ml, srcReqs, allsrc) =
+	fun loop (ml, allsrc) =
 	    case getInputTokens s of
-		NONE => (TextIO.closeIn s; (ml, srcReqs, allsrc))
+		NONE => (TextIO.closeIn s; (ml, allsrc))
 	      | SOME [x as ("dont_move_libraries" | "move_libraries")] =>
   		  (warn ["\"", x, "\" no longer supported",
 			 " (installer always moves libraries)\n"];
-		   loop (ml, srcReqs, allsrc))
-	      | SOME ["request", "src-smlnj"] => loop (ml, srcReqs, true)
-	      | SOME ["request", module] => if SS.member(allmoduleset, module)
-		  then loop (ml, module :: srcReqs, allsrc)
-		  else loop (module :: ml, srcReqs, allsrc)
-	      | SOME [] => loop (ml, srcReqs, allsrc)
+		   loop (ml, allsrc))
+	      | SOME ["request", "src-smlnj"] => loop (ml, true)
+	      | SOME ["request", module] => loop (module :: ml, allsrc)
+	      | SOME [] => loop (ml, allsrc)
 	      | SOME l => fail ["ill-formed targets line: ", tokenLine l, "\n"]
 
-	val (modules, srcReqs, allsrc) = loop ([], [], false)
+	val (modules, allsrc) = loop ([], false)
 
 	(* now resolve dependencies; get full list of modules
 	 * in correct build order: *)
 	val modules = resolve (modules, depfile)
 	val moduleset = SS.addList (SS.empty, modules)
 	val srcmoduleset = if allsrc then SS.union (moduleset, allmoduleset)
-			   else SS.addList (moduleset, srcReqs)
+			   else moduleset
 
 	(* fetch and unpack source trees, using auxiliary helper command
 	 * which takes the root directory as its first and the module
@@ -386,7 +384,8 @@
 		      salist := (fn () => standalone args) :: (!salist)
 	    in case SM.find (actions, module) of
 		   SOME al => app perform (rev al)
-		 | NONE => fail ["unknown module: ", module, "\n"]
+		 | NONE => if SS.member(allmoduleset, module) then ()
+		           else fail ["unknown module: ", module, "\n"]
 	    end
     in
 	(command_pathconfig "bindir";	(* dummy -- for CM make tool *)




--- base/runtime/include/ml-unixdep.h.orig	2012-08-02 20:03:33.000000000 +0200
+++ base/runtime/include/ml-unixdep.h	2013-06-18 13:16:20.292993889 +0200
@@ -371,6 +371,15 @@
 #  define __EXTENSIONS__
 #endif
 
+#if defined(OPSYS_FREEBSD)
+#  if defined(INCLUDE_FREEBSD_I386__TYPES)
+#    include <sys/cdefs.h>
+#    include INCLUDE_FREEBSD_I386__TYPES
+#  endif
+#  if defined(INCLUDE_FREEBSD_I386_SIGNAL)
+#    include INCLUDE_FREEBSD_I386_SIGNAL
+#  endif
+#endif
 #include INCLUDE_TYPES_H
 #include <unistd.h>
 #include <string.h>

Lines 1-6 Link Here

(-)files/patch-config___arch-n-opsys (-3 / +3 lines)
1	--- config/_arch-n-opsys.orig 2012-07-28 05:32:38.000000000 +0200	1	--- config/_arch-n-opsys.orig 2014-08-22 15:20:03.000000000 +0200
2	+++ config/_arch-n-opsys 2013-06-12 21:46:19.925992679 +0200	2	+++ config/_arch-n-opsys 2014-08-23 14:19:47.056122710 +0200
3	@@ -83,6 +83,8 @@	3	@@ -85,6 +85,8 @@
4	HEAP_OPSYS=bsd	4	HEAP_OPSYS=bsd
5	case `uname -m` in	5	case `uname -m` in
6	*86) ARCH=x86;;	6	*86) ARCH=x86;;

Lines 1-4 Link Here

(-)files/patch-config___heap2exec (-1 / +1 lines)
1	--- config/_heap2exec 2006-04-20 17:28:53.000000000 +0200	1	--- config/_heap2exec.orig 2006-04-20 17:28:53.000000000 +0200
2	+++ config/_heap2exec 2013-06-14 22:18:55.050990989 +0200	2	+++ config/_heap2exec 2013-06-14 22:18:55.050990989 +0200
3	@@ -83,6 +83,7 @@	3	@@ -83,6 +83,7 @@
4	A_PROG=	4	A_PROG=




--- config/install.sh.orig	2014-08-22 15:20:03.000000000 +0200
+++ config/install.sh	2014-08-23 14:19:47.061124086 +0200
@@ -17,6 +17,8 @@
     nolib=false
 fi
 

 if [ x${INSTALL_QUIETLY} = xtrue ] ; then
     export CM_VERBOSE
     CM_VERBOSE=false
@@ -37,6 +39,28 @@
     exit 1
 }
 

 this=$0
 
 
@@ -96,7 +120,28 @@
 # Especially important is CM_PATHCONFIG.
 #
 export CM_PATHCONFIG

 #
 # the release version that we are installing
 #
@@ -326,7 +371,12 @@
 # the name of the bin files directory
 #
 BOOT_ARCHIVE=boot.$ARCH-unix

 
 #
 # build the run-time system
@@ -335,9 +385,15 @@
     vsay $this: Run-time system already exists.
 else
     "$CONFIGDIR"/unpack "$ROOT" runtime

     if [ -x run.$ARCH-$OPSYS ]; then
 	mv run.$ARCH-$OPSYS "$RUNDIR"
 	if [ -f runx.$ARCH-$OPSYS ]; then
@@ -349,7 +405,7 @@
 	if [ -f run.$ARCH-$OPSYS.a ]; then
 	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
 	fi

     else
 	complain "$this: !!! Run-time system build failed for some reason."
     fi
@@ -375,7 +431,7 @@
 	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
     fi
 else

 
     fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
 
@@ -410,7 +466,7 @@
 	    cd "$ROOT"/"$BOOT_FILES"
 	    for anchor in * ; do
 		if [ -d $anchor ] ; then

 		    move $anchor "$LIBDIR"/$anchor
 		fi
 	    done
@@ -433,6 +489,18 @@
 
 cd "$ROOT"
 

+done
+
 #
 # Now do all the rest using the precompiled installer
 # (see base/system/smlnj/installer for details)
@@ -442,6 +510,12 @@
     export ROOT INSTALLDIR CONFIGDIR BINDIR
     CM_TOLERATE_TOOL_FAILURES=true

Lines 1-3 Link Here

(-)pkg-plist (+10 lines)
		1	man/man1/ml-antlr.1.gz
		2	man/man1/ml-build.1.gz
		3	man/man1/ml-makedepend.1.gz
		4	man/man1/ml-ulex.1.gz
		5	man/man1/sml.1.gz
		6	man/man7/smlnj.7.gz
1	smlnj/bin/.arch-n-opsys	7	smlnj/bin/.arch-n-opsys
2	smlnj/bin/.heap/heap2asm.%%MLARCH%%-bsd	8	smlnj/bin/.heap/heap2asm.%%MLARCH%%-bsd
3	smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd	9	smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd
Lines 170-175 Link Here
170	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm	176	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm
171	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm	177	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm
172	smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm	178	smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
		179	smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix/xml-lib.cm
173	@dirrm smlnj/bin/.heap	180	@dirrm smlnj/bin/.heap
174	@dirrm smlnj/bin/.run	181	@dirrm smlnj/bin/.run
175	@dirrm smlnj/bin	182	@dirrm smlnj/bin
Lines 333-337 Link Here
333	@dirrm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix	340	@dirrm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix
334	@dirrm smlnj/lib/unix-lib.cm/.cm	341	@dirrm smlnj/lib/unix-lib.cm/.cm
335	@dirrm smlnj/lib/unix-lib.cm	342	@dirrm smlnj/lib/unix-lib.cm
		343	@dirrm smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix
		344	@dirrm smlnj/lib/xml-lib.cm/.cm
		345	@dirrm smlnj/lib/xml-lib.cm
336	@dirrm smlnj/lib	346	@dirrm smlnj/lib
337	@dirrm smlnj	347	@dirrm smlnj

Return to bug 193431

Lines 1-8 Link Here

(-)Makefile (-6 / +33 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= smlnj	3	PORTNAME= smlnj
4	PORTVERSION= 110.76	4	PORTVERSION= 110.77
5	PORTREVISION= 1
6	CATEGORIES= lang	5	CATEGORIES= lang
7	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \	6	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
8	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/	7	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
Lines 65-72 Link Here
65	MLARCH= x86	64	MLARCH= x86
66	DISTFILES+= boot.x86-unix.tgz	65	DISTFILES+= boot.x86-unix.tgz
67	.endif	66	.endif
68	DISTFILES+= MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz ml-burg.tgz \	67	DISTFILES+= MLRISC.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \
69	ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \	68	ml-burg.tgz ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \
70	smlnj-lib.tgz trace-debug-profile.tgz	69	smlnj-lib.tgz trace-debug-profile.tgz
71		70
72	PLIST_SUB= MLARCH=${MLARCH}	71	PLIST_SUB= MLARCH=${MLARCH}
Lines 99-105 Link Here
99	MLBINRELATIVE= ${MLROOTRELATIVE}/bin	98	MLBINRELATIVE= ${MLROOTRELATIVE}/bin
100	MLBIN= ${MLROOT}/bin	99	MLBIN= ${MLROOT}/bin
101	MLLIB= ${MLROOT}/lib	100	MLLIB= ${MLROOT}/lib
102	MLSTDSRCDIRS= cml heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-lib	101	MLSTDSRCDIRS= cml doc heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-lib
103	MLSRCDIRS= base ${MLSTDSRCDIRS} \	102	MLSRCDIRS= base ${MLSTDSRCDIRS} \
104	ckit eXene pgraph smlnj-c	103	ckit eXene pgraph smlnj-c
105	MLSRCS=	104	MLSRCS=
Lines 239-244 Link Here
239	./config/install.sh	238	./config/install.sh
240	.endif	239	.endif
241		240
		241	# If Mac OS X resource files make it into the distribution tarballs,
		242	# then we have to remove them at several points during the
		243	# installation process. This is no longer necessary with FreeBSD 10
		244	# as it uses libarchive 3.x (via bsdtar), but earlier versions
		245	# don't ignore such resource files and hence WRKDIR and STAGEDIR
		246	# are full of them. Once FreeBSD 9 will be out of service, all
		247	# lines in this Makefile can be removed which contain a pattern
		248	# for the prefix "._" of the resource files. Background information:
		249	# <https://github.com/libarchive/libarchive/wiki/TarExtendedAttributes#Apple_tar>
		250
		251	post-build:
		252	${FIND} ${WRKDIR} -type f -name '\._*' -delete
		253
242	# Nowadays PLIST has to be computed before installation. We do it in	254	# Nowadays PLIST has to be computed before installation. We do it in
243	# "pre-install" because source extraction happens during "build".	255	# "pre-install" because source extraction happens during "build".
244		256
Lines 261-266 Link Here
261	.if defined(ML_EVERYTHING)	273	.if defined(ML_EVERYTHING)
262	@${ECHO} -n '(* Computing package list ...'	274	@${ECHO} -n '(* Computing package list ...'
263	@${TAR} -tzf ${WRKDIR}/runtime.tgz \| \	275	@${TAR} -tzf ${WRKDIR}/runtime.tgz \| \
		276	${GREP} -E -v '(^\|/)\._.*' \| \
264	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \	277	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
265	-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \	278	-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
266	> ${MLRUNTIMEPLIST}	279	> ${MLRUNTIMEPLIST}
Lines 347-352 Link Here
347	CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \	360	CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \
348	./config/install.sh	361	./config/install.sh
349	.endif	362	.endif
		363	[ ! -d ${STAGEDIR} ] \|\| \
		364	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
		365	@${ECHO} '(* Installing man pages. *)'
		366	.for mansect in 1 2 3 4 5 6 7 8 9
		367	@[ ! -d ${WRKDIR}/doc/man/man${mansect} ] \|\| \
		368	{ cd ${WRKDIR}/doc/man/man${mansect} && ls *.${mansect} \| \
		369	${XARGS} -J % \
		370	${INSTALL_MAN} % ${STAGEDIR}${MANPREFIX}/man/man${mansect} ; }
		371	.endfor
		372	@${ECHO} '(* Stripping runtime executable: *)'
350	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \	373	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
351	( eval $${MLARCHOPSYS} ; \	374	( eval $${MLARCHOPSYS} ; \
352	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )	375	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )
Lines 368-374 Link Here
368	.endif	391	.endif
369		392
370	post-stage:	393	post-stage:
371	${STRIP_CMD} ${STAGEDIR}${PREFIX}/smlnj/bin/.run/run.x86-freebsd.so	394	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
		395	@${ECHO} '(* Stripping runtime executable: *)'
		396	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
		397	( eval $${MLARCHOPSYS} ; \
		398	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )
372		399
373	.ifndef MULTIEXEC_WRAPPER_VERBOSE	400	.ifndef MULTIEXEC_WRAPPER_VERBOSE
374	deinstall:	401	deinstall:

Lines 1-40 Link Here

(-)distinfo (-40 / +42 lines)
1	SIZE (smlnj/110.76/MLRISC.tgz) = 1434516	1	SHA256 (smlnj/110.77/MLRISC.tgz) = 4b443ee9e27bc8d2010bdce5724302c7d338e8eba0051d45cb4e384204488a76
2	SHA256 (smlnj/110.76/MLRISC.tgz) = 9d944dea4e80a8ef2cc01e7e16ae72cb280f2e4dc0d6648c9bc27156ccfcc102	2	SIZE (smlnj/110.77/MLRISC.tgz) = 1479104
3	SIZE (smlnj/110.76/boot.x86-unix.tgz) = 5890950	3	SHA256 (smlnj/110.77/boot.x86-unix.tgz) = 9982a36d9fb3d2d15590d0d8bb15a30d3e684ad49f56d69eef8684f4eaf3bf02
4	SHA256 (smlnj/110.76/boot.x86-unix.tgz) = dd16569fb6991d673e66dae57f5e9b372d5a4e305f92a9756002e4bb296c9b61	4	SIZE (smlnj/110.77/boot.x86-unix.tgz) = 5905482
5	SIZE (smlnj/110.76/ckit.tgz) = 194486	5	SHA256 (smlnj/110.77/ckit.tgz) = 29145b1739d46173cbaa87456b2bed35977c4ae7e83c48134a591459939b3966
6	SHA256 (smlnj/110.76/ckit.tgz) = c4534e6e7f910ebee3146cc8ed214a1d5a2ea90afbd79c2290cefdc784ee0dbb	6	SIZE (smlnj/110.77/ckit.tgz) = 206672
7	SIZE (smlnj/110.76/cm.tgz) = 200425	7	SHA256 (smlnj/110.77/cm.tgz) = 1c60316b3f16ae1a93cb87e281edcf2a84a554ac0415f010b8d565c2ae3a0a82
8	SHA256 (smlnj/110.76/cm.tgz) = 539e8199764a803f486dbf5c0ecb3fa3b2277a6b52ccbbf350bbdcc231bec193	8	SIZE (smlnj/110.77/cm.tgz) = 209949
9	SIZE (smlnj/110.76/cml.tgz) = 106005	9	SHA256 (smlnj/110.77/cml.tgz) = bc4548eda9531c52029ed68a7988985b62ad17e95841c04dbbe32b4b30df4ef7
10	SHA256 (smlnj/110.76/cml.tgz) = cbd357a3b3377d049911a247be880dcde7f52f705f7cdfe800b67631858681e1	10	SIZE (smlnj/110.77/cml.tgz) = 119083
11	SHA256 (smlnj/110.76/compiler.tgz) = 322755b8a3f105eec4ce4a3197aaf83bcd542e4c2b2f43c724d0ae8f393bf681	11	SHA256 (smlnj/110.77/compiler.tgz) = fcc7388167ee2d0048644bb2147bbca3e16f60be326dd724407e0f51e254e52f
12	SIZE (smlnj/110.76/compiler.tgz) = 817182	12	SIZE (smlnj/110.77/compiler.tgz) = 841677
13	SHA256 (smlnj/110.76/config.tgz) = 41cec8bd28c43f49bea24cc7d80d091d8a0e0c7473ee67e4a0b06019567ca557	13	SHA256 (smlnj/110.77/config.tgz) = 6bed2026e05367f247e2fcfa918edb835bdab24182f02f3253c1baf2f301b552
14	SIZE (smlnj/110.76/config.tgz) = 511139	14	SIZE (smlnj/110.77/config.tgz) = 514900
15	SHA256 (smlnj/110.76/eXene.tgz) = 35befa7d37207c7fc2eab81e29e3a5afb4f2c5893f7336394906425d5f4ee607	15	SHA256 (smlnj/110.77/doc.tgz) = 8301bccdc1e99e8865e905070f7719d94a0ae39b44733d961a3e3002d97dd27e
16	SIZE (smlnj/110.76/eXene.tgz) = 703059	16	SIZE (smlnj/110.77/doc.tgz) = 10240
17	SIZE (smlnj/110.76/heap2asm.tgz) = 1314	17	SHA256 (smlnj/110.77/eXene.tgz) = d4d3ccbde1bc11943054fb093a34c8531c9e8f56731293ca2470eab21602ea33
18	SHA256 (smlnj/110.76/heap2asm.tgz) = 8c1f52bc7459de1d0d8e07807abb8e8916fa5ef1cf08c0ceb3f06437f977215d	18	SIZE (smlnj/110.77/eXene.tgz) = 729294
19	SIZE (smlnj/110.76/ml-burg.tgz) = 36341	19	SHA256 (smlnj/110.77/heap2asm.tgz) = f3f5c26d11dbe8019e6b3349ab07c04ffe553780a3a6ca0b000fe8084886ada5
20	SHA256 (smlnj/110.76/ml-burg.tgz) = d59dad9188778c96b3e59f9d754a4fbdef4b67de2ded67deb0d26c40915a594e	20	SIZE (smlnj/110.77/heap2asm.tgz) = 1606
21	SIZE (smlnj/110.76/ml-lex.tgz) = 33150	21	SHA256 (smlnj/110.77/ml-burg.tgz) = 9bc7bb014d34a63cb3ac8c42104bd579e8990ab2803c32a6a4410fcf8cfcbd4c
22	SHA256 (smlnj/110.76/ml-lex.tgz) = 9d00143cff4e8cc87421270d34b29864c27d353d6b429cce3d3428f6c7280a6b	22	SIZE (smlnj/110.77/ml-burg.tgz) = 37604
23	SIZE (smlnj/110.76/ml-lpt.tgz) = 256293	23	SHA256 (smlnj/110.77/ml-lex.tgz) = c4c0e108bf166f77e083692a27f9231d730c5b2a73a2f9f5409e55928c679553
24	SHA256 (smlnj/110.76/ml-lpt.tgz) = 9970b22506a605012055700cc28497c2850d29fbb7bcc5b069fbef785220fc8d	24	SIZE (smlnj/110.77/ml-lex.tgz) = 34081
25	SHA256 (smlnj/110.76/ml-yacc.tgz) = 9151f7fef0abcb312daf731621b682b2c7e9f87a151832e99c30b5e56f03f1cf	25	SHA256 (smlnj/110.77/ml-lpt.tgz) = eff30e6a3c4afb7f8265650e3e1cc83a8ff252ed19f22b30c2c431c9beca126e
26	SIZE (smlnj/110.76/ml-yacc.tgz) = 99943	26	SIZE (smlnj/110.77/ml-lpt.tgz) = 266511
27	SHA256 (smlnj/110.76/nlffi.tgz) = 07bdc123b2c93f01bc0a5bbdf33aac0b34407bd70cd8d3e1d06ad55e92deb521	27	SHA256 (smlnj/110.77/ml-yacc.tgz) = 24a2b1d955e990c6f2a64d6be4df0c7d9bf430f56501587ecf95d30732cf266c
28	SIZE (smlnj/110.76/nlffi.tgz) = 74484	28	SIZE (smlnj/110.77/ml-yacc.tgz) = 103554
29	SIZE (smlnj/110.76/pgraph.tgz) = 5440	29	SHA256 (smlnj/110.77/nlffi.tgz) = 8729d2aa203329fa76f9a7dccafe6fe88d0f397f1238727fea8fa1c67ae38cf0
30	SHA256 (smlnj/110.76/pgraph.tgz) = df44036b170f68a79a62134812adecd54c3f0da2188f0190996fc57faa10969c	30	SIZE (smlnj/110.77/nlffi.tgz) = 79026
31	SIZE (smlnj/110.76/runtime.tgz) = 324373	31	SHA256 (smlnj/110.77/pgraph.tgz) = 5b46d4d9668f27b7538b5a8f6b62d9cd2c5797118e303aa691266df67f6e818c
32	SHA256 (smlnj/110.76/runtime.tgz) = f6086cd4e30ea3a89c528ee08c793eca77f7701589e0436acf347faf7e940a7f	32	SIZE (smlnj/110.77/pgraph.tgz) = 5907
33	SHA256 (smlnj/110.76/smlnj-c.tgz) = 0cdf1c3563f3080dffc184e8e64f5e58f7f21f1426d43cb8960cf090e2232a6f	33	SHA256 (smlnj/110.77/runtime.tgz) = 8e40aa7d39c806d36360174d36bc376fa53662b5ac4f0a4add120c8c2fe67f2b
34	SIZE (smlnj/110.76/smlnj-c.tgz) = 10534	34	SIZE (smlnj/110.77/runtime.tgz) = 349470
35	SIZE (smlnj/110.76/smlnj-lib.tgz) = 402937	35	SHA256 (smlnj/110.77/smlnj-c.tgz) = 6de6f0d5a41e7fe097f3fae2815829c4bb14729145efa293fc74bd138180f01d
36	SHA256 (smlnj/110.76/smlnj-lib.tgz) = 81e994a07d7c8979b28c4911272de3c37eec648e58c03a9dc1ecb9bbbadca1d7	36	SIZE (smlnj/110.77/smlnj-c.tgz) = 11462
37	SIZE (smlnj/110.76/system.tgz) = 227685	37	SHA256 (smlnj/110.77/smlnj-lib.tgz) = 9232f7cf61a9a7a859dc9249a47a77b954a746137e8d8f6e57236f8c030677e7
38	SHA256 (smlnj/110.76/system.tgz) = 8f6a143db22a9d025e2820899c9cccbf0e66c679a9aa68c3dcd1bec68003da37	38	SIZE (smlnj/110.77/smlnj-lib.tgz) = 434946
39	SHA256 (smlnj/110.76/trace-debug-profile.tgz) = 3769e1d251d04c95b4c1b759f3bf21644bcb3135404d0346e8ff34553ae704df	39	SHA256 (smlnj/110.77/system.tgz) = 367cce5e0ab848d28bc019862a30c2b5b774fd4733301bb72fec811d8e9d7f54
40	SIZE (smlnj/110.76/trace-debug-profile.tgz) = 3899	40	SIZE (smlnj/110.77/system.tgz) = 246164
		41	SHA256 (smlnj/110.77/trace-debug-profile.tgz) = e6c7a4ed96de076b8d27af44eb8bfc1121e32f915d9a0b8fc356b5a27c761908
		42	SIZE (smlnj/110.77/trace-debug-profile.tgz) = 4329

Lines 1-36 Link Here

(-)files/do-patch-base_runtime_c-libs_posix-os_tmpname.c (-36 lines)
1	--- base/runtime/c-libs/posix-os/tmpname.c.orig 2000-06-01 20:34:03.000000000 +0200
2	+++ base/runtime/c-libs/posix-os/tmpname.c 2014-08-01 16:35:28.000000000 +0200
3	@@ -4,8 +4,11 @@
4	*/
5
6	#include <stdio.h>
7	+#include <string.h>
8	+#include <unistd.h>
9	#include "ml-base.h"
10	#include "ml-values.h"
11	+#include "ml-c.h"
12	#include "ml-objects.h"
13	#include "cfun-proto-list.h"
14
15	@@ -13,9 +16,18 @@
16	*/
17	ml_val_t _ml_OS_tmpname (ml_state_t *msp, ml_val_t arg)
18	{
19	- char buf[L_tmpnam];
20	-
21	- tmpnam (buf);
22	+ char template[] = "/tmp/TMP-SMLNJ.XXXXXX";
23	+ char buf[sizeof(template)];
24	+ int fd;
25	+
26	+ strcpy (buf, template);
27	+
28	+ fd = mkstemp (buf);
29	+
30	+ if (fd == -1)
31	+ return RAISE_SYSERR(msp, -1);
32	+ else
33	+ close (fd);
34
35	return ML_CString (msp, buf);
36

Line 0 Link Here

(-)files/do-patch-base_runtime_include_ml-unixdep.h (+34 lines)
	1	--- base/runtime/include/ml-unixdep.h.orig 2014-08-17 21:09:56.000000000 +0200
	2	+++ base/runtime/include/ml-unixdep.h 2014-08-23 22:24:36.475122070 +0200
	3	@@ -33,6 +33,7 @@
	4	* HAS_UCONTEXT if signal handlers have a ucontext_t argument.
	5	* HAS_STRERROR if the system provides the ISO C strerror function.
	6	* INT_GIDLIST if the second argument to getgroups is int[].
	7	+ * HAS_MKSTEMP if OS provides the POSIX mkstemp function.
	8	*
	9	* Note that only one of the following sets of symbols should be defined:
	10	* { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }
	11	@@ -295,6 +296,7 @@
	12	# define HAS_ILOGB
	13	# define HAS_SIGCONTEXT
	14	# define HAS_STRERROR
	15	+# define HAS_MKSTEMP
	16
	17	/* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */
	18	# define MAP_ANONYMOUS MAP_ANON
	19	@@ -377,6 +379,15 @@
	20	# define __EXTENSIONS__
	21	#endif
	22
	23	+#if defined(OPSYS_FREEBSD)
	24	+# if defined(INCLUDE_FREEBSD_I386__TYPES)
	25	+# include <sys/cdefs.h>
	26	+# include INCLUDE_FREEBSD_I386__TYPES
	27	+# endif
	28	+# if defined(INCLUDE_FREEBSD_I386_SIGNAL)
	29	+# include INCLUDE_FREEBSD_I386_SIGNAL
	30	+# endif
	31	+#endif
	32	#include INCLUDE_TYPES_H
	33	#include <unistd.h>
	34	#include <string.h>

Line 0 Link Here

(-)files/do-patch-base_system_smlnj_installer_generic-install.sml (+49 lines)
	1	--- base/system/smlnj/installer/generic-install.sml.orig 2014-08-23 04:18:09.000000000 +0200
	2	+++ base/system/smlnj/installer/generic-install.sml 2014-08-28 21:51:06.000000000 +0200
	3	@@ -233,28 +233,26 @@
	4	(* ------------------------------ *)
	5
	6	(* parse the targets file *)
	7	- fun loop (ml, srcReqs, allsrc) =
	8	+ fun loop (ml, allsrc) =
	9	case getInputTokens s of
	10	- NONE => (TextIO.closeIn s; (ml, srcReqs, allsrc))
	11	+ NONE => (TextIO.closeIn s; (ml, allsrc))
	12	\| SOME [x as ("dont_move_libraries" \| "move_libraries")] =>
	13	(warn ["\"", x, "\" no longer supported",
	14	" (installer always moves libraries)\n"];
	15	- loop (ml, srcReqs, allsrc))
	16	- \| SOME ["request", "src-smlnj"] => loop (ml, srcReqs, true)
	17	- \| SOME ["request", module] => if SS.member(allmoduleset, module)
	18	- then loop (ml, module :: srcReqs, allsrc)
	19	- else loop (module :: ml, srcReqs, allsrc)
	20	- \| SOME [] => loop (ml, srcReqs, allsrc)
	21	+ loop (ml, allsrc))
	22	+ \| SOME ["request", "src-smlnj"] => loop (ml, true)
	23	+ \| SOME ["request", module] => loop (module :: ml, allsrc)
	24	+ \| SOME [] => loop (ml, allsrc)
	25	\| SOME l => fail ["ill-formed targets line: ", tokenLine l, "\n"]
	26
	27	- val (modules, srcReqs, allsrc) = loop ([], [], false)
	28	+ val (modules, allsrc) = loop ([], false)
	29
	30	(* now resolve dependencies; get full list of modules
	31	* in correct build order: *)
	32	val modules = resolve (modules, depfile)
	33	val moduleset = SS.addList (SS.empty, modules)
	34	val srcmoduleset = if allsrc then SS.union (moduleset, allmoduleset)
	35	- else SS.addList (moduleset, srcReqs)
	36	+ else moduleset
	37
	38	(* fetch and unpack source trees, using auxiliary helper command
	39	* which takes the root directory as its first and the module
	40	@@ -386,7 +384,8 @@
	41	salist := (fn () => standalone args) :: (!salist)
	42	in case SM.find (actions, module) of
	43	SOME al => app perform (rev al)
	44	- \| NONE => fail ["unknown module: ", module, "\n"]
	45	+ \| NONE => if SS.member(allmoduleset, module) then ()
	46	+ else fail ["unknown module: ", module, "\n"]
	47	end
	48	in
	49	(command_pathconfig "bindir"; (* dummy -- for CM make tool *)

Lines 1-18 Link Here

(-)files/extra-patch-base_runtime_include_ml-unixdep.h (-18 lines)
1	--- base/runtime/include/ml-unixdep.h.orig 2012-08-02 20:03:33.000000000 +0200
2	+++ base/runtime/include/ml-unixdep.h 2013-06-18 13:16:20.292993889 +0200
3	@@ -371,6 +371,15 @@
4	# define __EXTENSIONS__
5	#endif
6
7	+#if defined(OPSYS_FREEBSD)
8	+# if defined(INCLUDE_FREEBSD_I386__TYPES)
9	+# include <sys/cdefs.h>
10	+# include INCLUDE_FREEBSD_I386__TYPES
11	+# endif
12	+# if defined(INCLUDE_FREEBSD_I386_SIGNAL)
13	+# include INCLUDE_FREEBSD_I386_SIGNAL
14	+# endif
15	+#endif
16	#include INCLUDE_TYPES_H
17	#include <unistd.h>
18	#include <string.h>

Lines 1-6 Link Here

(-)files/patch-config_install.sh (-13 / +13 lines)
1	--- config/install.sh.orig 2012-03-02 23:57:26.000000000 +0100	1	--- config/install.sh.orig 2014-08-22 15:20:03.000000000 +0200
2	+++ config/install.sh 2014-07-14 20:12:56.000000000 +0200	2	+++ config/install.sh 2014-08-23 14:19:47.061124086 +0200
3	@@ -18,6 +18,8 @@	3	@@ -17,6 +17,8 @@
4	nolib=false	4	nolib=false
5	fi	5	fi
6		6
Lines 9-15 Link Here
9	if [ x${INSTALL_QUIETLY} = xtrue ] ; then	9	if [ x${INSTALL_QUIETLY} = xtrue ] ; then
10	export CM_VERBOSE	10	export CM_VERBOSE
11	CM_VERBOSE=false	11	CM_VERBOSE=false
12	@@ -38,6 +40,28 @@	12	@@ -37,6 +39,28 @@
13	exit 1	13	exit 1
14	}	14	}
15		15
Lines 38-44 Link Here
38	this=$0	38	this=$0
39		39
40		40
41	@@ -97,7 +121,28 @@	41	@@ -96,7 +120,28 @@
42	# Especially important is CM_PATHCONFIG.	42	# Especially important is CM_PATHCONFIG.
43	#	43	#
44	export CM_PATHCONFIG	44	export CM_PATHCONFIG
Lines 68-74 Link Here
68	#	68	#
69	# the release version that we are installing	69	# the release version that we are installing
70	#	70	#
71	@@ -327,7 +372,12 @@	71	@@ -326,7 +371,12 @@
72	# the name of the bin files directory	72	# the name of the bin files directory
73	#	73	#
74	BOOT_ARCHIVE=boot.$ARCH-unix	74	BOOT_ARCHIVE=boot.$ARCH-unix
Lines 82-88 Link Here
82		82
83	#	83	#
84	# build the run-time system	84	# build the run-time system
85	@@ -336,9 +386,15 @@	85	@@ -335,9 +385,15 @@
86	vsay $this: Run-time system already exists.	86	vsay $this: Run-time system already exists.
87	else	87	else
88	"$CONFIGDIR"/unpack "$ROOT" runtime	88	"$CONFIGDIR"/unpack "$ROOT" runtime
Lines 99-105 Link Here
99	if [ -x run.$ARCH-$OPSYS ]; then	99	if [ -x run.$ARCH-$OPSYS ]; then
100	mv run.$ARCH-$OPSYS "$RUNDIR"	100	mv run.$ARCH-$OPSYS "$RUNDIR"
101	if [ -f runx.$ARCH-$OPSYS ]; then	101	if [ -f runx.$ARCH-$OPSYS ]; then
102	@@ -350,7 +406,7 @@	102	@@ -349,7 +405,7 @@
103	if [ -f run.$ARCH-$OPSYS.a ]; then	103	if [ -f run.$ARCH-$OPSYS.a ]; then
104	mv run.$ARCH-$OPSYS.a "$RUNDIR"	104	mv run.$ARCH-$OPSYS.a "$RUNDIR"
105	fi	105	fi
Lines 108-114 Link Here
108	else	108	else
109	complain "$this: !!! Run-time system build failed for some reason."	109	complain "$this: !!! Run-time system build failed for some reason."
110	fi	110	fi
111	@@ -376,7 +432,7 @@	111	@@ -375,7 +431,7 @@
112	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."	112	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
113	fi	113	fi
114	else	114	else
Lines 117-123 Link Here
117		117
118	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis	118	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
119		119
120	@@ -411,7 +467,7 @@	120	@@ -410,7 +466,7 @@
121	cd "$ROOT"/"$BOOT_FILES"	121	cd "$ROOT"/"$BOOT_FILES"
122	for anchor in * ; do	122	for anchor in * ; do
123	if [ -d $anchor ] ; then	123	if [ -d $anchor ] ; then
Lines 126-132 Link Here
126	move $anchor "$LIBDIR"/$anchor	126	move $anchor "$LIBDIR"/$anchor
127	fi	127	fi
128	done	128	done
129	@@ -434,6 +490,18 @@	129	@@ -433,6 +489,18 @@
130		130
131	cd "$ROOT"	131	cd "$ROOT"
132		132
Lines 143-150 Link Here
143	+done	143	+done
144	+	144	+
145	#	145	#
146	# Now do all the rest using the precompiled installer:	146	# Now do all the rest using the precompiled installer
147	#	147	# (see base/system/smlnj/installer for details)
148	@@ -442,6 +510,12 @@	148	@@ -442,6 +510,12 @@
149	export ROOT INSTALLDIR CONFIGDIR BINDIR	149	export ROOT INSTALLDIR CONFIGDIR BINDIR
150	CM_TOLERATE_TOOL_FAILURES=true	150	CM_TOLERATE_TOOL_FAILURES=true