Attachment 147015 Details for Bug 193431 – update lang/smlnj to 110.77

[patch] update lang/smlnj to 110.77

smlnj.patch.20140902 (text/plain), 19.31 KB, created by Johannes 5 on 2014-09-07 16:34:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes 5

Created: 2014-09-07 16:34:01 UTC

Size: 19.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 367058)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	smlnj
>-PORTVERSION=	110.76
>-PORTREVISION=	1
>+PORTVERSION=	110.77
> CATEGORIES=	lang
> MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
> 		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
>@@ -65,8 +64,8 @@
> MLARCH=		x86
> DISTFILES+=	boot.x86-unix.tgz
> .endif
>-DISTFILES+=	MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz ml-burg.tgz \
>-		ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \
>+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}
>@@ -99,7 +98,7 @@
> MLBINRELATIVE=	${MLROOTRELATIVE}/bin
> MLBIN=		${MLROOT}/bin
> MLLIB=		${MLROOT}/lib
>-MLSTDSRCDIRS=	cml heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-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=
>@@ -239,6 +238,19 @@
> 	./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".
> 
>@@ -261,6 +273,7 @@
> .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}
>@@ -347,6 +360,16 @@
> 	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}" )
>@@ -368,7 +391,11 @@
> .endif
> 
> post-stage:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/smlnj/bin/.run/run.x86-freebsd.so
>+	${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:
>Index: distinfo
>===================================================================
>--- distinfo	(revision 367058)
>+++ distinfo	(working copy)
>@@ -1,40 +1,42 @@
>-SIZE (smlnj/110.76/MLRISC.tgz) = 1434516
>-SHA256 (smlnj/110.76/MLRISC.tgz) = 9d944dea4e80a8ef2cc01e7e16ae72cb280f2e4dc0d6648c9bc27156ccfcc102
>-SIZE (smlnj/110.76/boot.x86-unix.tgz) = 5890950
>-SHA256 (smlnj/110.76/boot.x86-unix.tgz) = dd16569fb6991d673e66dae57f5e9b372d5a4e305f92a9756002e4bb296c9b61
>-SIZE (smlnj/110.76/ckit.tgz) = 194486
>-SHA256 (smlnj/110.76/ckit.tgz) = c4534e6e7f910ebee3146cc8ed214a1d5a2ea90afbd79c2290cefdc784ee0dbb
>-SIZE (smlnj/110.76/cm.tgz) = 200425
>-SHA256 (smlnj/110.76/cm.tgz) = 539e8199764a803f486dbf5c0ecb3fa3b2277a6b52ccbbf350bbdcc231bec193
>-SIZE (smlnj/110.76/cml.tgz) = 106005
>-SHA256 (smlnj/110.76/cml.tgz) = cbd357a3b3377d049911a247be880dcde7f52f705f7cdfe800b67631858681e1
>-SHA256 (smlnj/110.76/compiler.tgz) = 322755b8a3f105eec4ce4a3197aaf83bcd542e4c2b2f43c724d0ae8f393bf681
>-SIZE (smlnj/110.76/compiler.tgz) = 817182
>-SHA256 (smlnj/110.76/config.tgz) = 41cec8bd28c43f49bea24cc7d80d091d8a0e0c7473ee67e4a0b06019567ca557
>-SIZE (smlnj/110.76/config.tgz) = 511139
>-SHA256 (smlnj/110.76/eXene.tgz) = 35befa7d37207c7fc2eab81e29e3a5afb4f2c5893f7336394906425d5f4ee607
>-SIZE (smlnj/110.76/eXene.tgz) = 703059
>-SIZE (smlnj/110.76/heap2asm.tgz) = 1314
>-SHA256 (smlnj/110.76/heap2asm.tgz) = 8c1f52bc7459de1d0d8e07807abb8e8916fa5ef1cf08c0ceb3f06437f977215d
>-SIZE (smlnj/110.76/ml-burg.tgz) = 36341
>-SHA256 (smlnj/110.76/ml-burg.tgz) = d59dad9188778c96b3e59f9d754a4fbdef4b67de2ded67deb0d26c40915a594e
>-SIZE (smlnj/110.76/ml-lex.tgz) = 33150
>-SHA256 (smlnj/110.76/ml-lex.tgz) = 9d00143cff4e8cc87421270d34b29864c27d353d6b429cce3d3428f6c7280a6b
>-SIZE (smlnj/110.76/ml-lpt.tgz) = 256293
>-SHA256 (smlnj/110.76/ml-lpt.tgz) = 9970b22506a605012055700cc28497c2850d29fbb7bcc5b069fbef785220fc8d
>-SHA256 (smlnj/110.76/ml-yacc.tgz) = 9151f7fef0abcb312daf731621b682b2c7e9f87a151832e99c30b5e56f03f1cf
>-SIZE (smlnj/110.76/ml-yacc.tgz) = 99943
>-SHA256 (smlnj/110.76/nlffi.tgz) = 07bdc123b2c93f01bc0a5bbdf33aac0b34407bd70cd8d3e1d06ad55e92deb521
>-SIZE (smlnj/110.76/nlffi.tgz) = 74484
>-SIZE (smlnj/110.76/pgraph.tgz) = 5440
>-SHA256 (smlnj/110.76/pgraph.tgz) = df44036b170f68a79a62134812adecd54c3f0da2188f0190996fc57faa10969c
>-SIZE (smlnj/110.76/runtime.tgz) = 324373
>-SHA256 (smlnj/110.76/runtime.tgz) = f6086cd4e30ea3a89c528ee08c793eca77f7701589e0436acf347faf7e940a7f
>-SHA256 (smlnj/110.76/smlnj-c.tgz) = 0cdf1c3563f3080dffc184e8e64f5e58f7f21f1426d43cb8960cf090e2232a6f
>-SIZE (smlnj/110.76/smlnj-c.tgz) = 10534
>-SIZE (smlnj/110.76/smlnj-lib.tgz) = 402937
>-SHA256 (smlnj/110.76/smlnj-lib.tgz) = 81e994a07d7c8979b28c4911272de3c37eec648e58c03a9dc1ecb9bbbadca1d7
>-SIZE (smlnj/110.76/system.tgz) = 227685
>-SHA256 (smlnj/110.76/system.tgz) = 8f6a143db22a9d025e2820899c9cccbf0e66c679a9aa68c3dcd1bec68003da37
>-SHA256 (smlnj/110.76/trace-debug-profile.tgz) = 3769e1d251d04c95b4c1b759f3bf21644bcb3135404d0346e8ff34553ae704df
>-SIZE (smlnj/110.76/trace-debug-profile.tgz) = 3899
>+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
>Index: files/do-patch-base_runtime_c-libs_posix-os_tmpname.c
>===================================================================
>--- files/do-patch-base_runtime_c-libs_posix-os_tmpname.c	(revision 367058)
>+++ files/do-patch-base_runtime_c-libs_posix-os_tmpname.c	(working copy)
>@@ -1,36 +0,0 @@
>---- 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);
>- 
>Index: files/do-patch-base_runtime_include_ml-unixdep.h
>===================================================================
>--- files/do-patch-base_runtime_include_ml-unixdep.h	(revision 0)
>+++ files/do-patch-base_runtime_include_ml-unixdep.h	(working copy)
>@@ -0,0 +1,34 @@
>+--- 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>
>Index: files/do-patch-base_system_smlnj_installer_generic-install.sml
>===================================================================
>--- files/do-patch-base_system_smlnj_installer_generic-install.sml	(revision 0)
>+++ files/do-patch-base_system_smlnj_installer_generic-install.sml	(working copy)
>@@ -0,0 +1,49 @@
>+--- 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 *)
>Index: files/extra-patch-base_runtime_include_ml-unixdep.h
>===================================================================
>--- files/extra-patch-base_runtime_include_ml-unixdep.h	(revision 367058)
>+++ files/extra-patch-base_runtime_include_ml-unixdep.h	(working copy)
>@@ -1,18 +0,0 @@
>---- 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>
>Index: files/patch-config___arch-n-opsys
>===================================================================
>--- files/patch-config___arch-n-opsys	(revision 367058)
>+++ files/patch-config___arch-n-opsys	(working copy)
>@@ -1,6 +1,6 @@
>---- config/_arch-n-opsys.orig	2012-07-28 05:32:38.000000000 +0200
>-+++ config/_arch-n-opsys	2013-06-12 21:46:19.925992679 +0200
>-@@ -83,6 +83,8 @@
>+--- config/_arch-n-opsys.orig	2014-08-22 15:20:03.000000000 +0200
>++++ config/_arch-n-opsys	2014-08-23 14:19:47.056122710 +0200
>+@@ -85,6 +85,8 @@
>      HEAP_OPSYS=bsd
>      case `uname -m` in
>        *86) ARCH=x86;;
>Index: files/patch-config___heap2exec
>===================================================================
>--- files/patch-config___heap2exec	(revision 367058)
>+++ files/patch-config___heap2exec	(working copy)
>@@ -1,4 +1,4 @@
>---- config/_heap2exec	2006-04-20 17:28:53.000000000 +0200
>+--- config/_heap2exec.orig	2006-04-20 17:28:53.000000000 +0200
> +++ config/_heap2exec	2013-06-14 22:18:55.050990989 +0200
> @@ -83,6 +83,7 @@
>  A_PROG=
>Index: files/patch-config_install.sh
>===================================================================
>--- files/patch-config_install.sh	(revision 367058)
>+++ files/patch-config_install.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- config/install.sh.orig	2012-03-02 23:57:26.000000000 +0100
>-+++ config/install.sh	2014-07-14 20:12:56.000000000 +0200
>-@@ -18,6 +18,8 @@
>+--- 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
>  
>@@ -9,7 +9,7 @@
>  if [ x${INSTALL_QUIETLY} = xtrue ] ; then
>      export CM_VERBOSE
>      CM_VERBOSE=false
>-@@ -38,6 +40,28 @@
>+@@ -37,6 +39,28 @@
>      exit 1
>  }
>  
>@@ -38,7 +38,7 @@
>  this=$0
>  
>  
>-@@ -97,7 +121,28 @@
>+@@ -96,7 +120,28 @@
>  # Especially important is CM_PATHCONFIG.
>  #
>  export CM_PATHCONFIG
>@@ -68,7 +68,7 @@
>  #
>  # the release version that we are installing
>  #
>-@@ -327,7 +372,12 @@
>+@@ -326,7 +371,12 @@
>  # the name of the bin files directory
>  #
>  BOOT_ARCHIVE=boot.$ARCH-unix
>@@ -82,7 +82,7 @@
>  
>  #
>  # build the run-time system
>-@@ -336,9 +386,15 @@
>+@@ -335,9 +385,15 @@
>      vsay $this: Run-time system already exists.
>  else
>      "$CONFIGDIR"/unpack "$ROOT" runtime
>@@ -99,7 +99,7 @@
>      if [ -x run.$ARCH-$OPSYS ]; then
>  	mv run.$ARCH-$OPSYS "$RUNDIR"
>  	if [ -f runx.$ARCH-$OPSYS ]; then
>-@@ -350,7 +406,7 @@
>+@@ -349,7 +405,7 @@
>  	if [ -f run.$ARCH-$OPSYS.a ]; then
>  	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
>  	fi
>@@ -108,7 +108,7 @@
>      else
>  	complain "$this: !!! Run-time system build failed for some reason."
>      fi
>-@@ -376,7 +432,7 @@
>+@@ -375,7 +431,7 @@
>  	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
>      fi
>  else
>@@ -117,7 +117,7 @@
>  
>      fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
>  
>-@@ -411,7 +467,7 @@
>+@@ -410,7 +466,7 @@
>  	    cd "$ROOT"/"$BOOT_FILES"
>  	    for anchor in * ; do
>  		if [ -d $anchor ] ; then
>@@ -126,7 +126,7 @@
>  		    move $anchor "$LIBDIR"/$anchor
>  		fi
>  	    done
>-@@ -434,6 +490,18 @@
>+@@ -433,6 +489,18 @@
>  
>  cd "$ROOT"
>  
>@@ -143,8 +143,8 @@
> +done
> +
>  #
>- # Now do all the rest using the precompiled installer:
>- #
>+ # 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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 367058)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,9 @@
>+man/man1/ml-antlr.1.gz
>+man/man1/ml-build.1.gz
>+man/man1/ml-makedepend.1.gz
>+man/man1/ml-ulex.1.gz
>+man/man1/sml.1.gz
>+man/man7/smlnj.7.gz
> smlnj/bin/.arch-n-opsys
> smlnj/bin/.heap/heap2asm.%%MLARCH%%-bsd
> smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd
>@@ -170,6 +176,7 @@
> smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm
> smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm
> smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
>+smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix/xml-lib.cm
> @dirrm smlnj/bin/.heap
> @dirrm smlnj/bin/.run
> @dirrm smlnj/bin
>@@ -333,5 +340,8 @@
> @dirrm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix
> @dirrm smlnj/lib/unix-lib.cm/.cm
> @dirrm smlnj/lib/unix-lib.cm
>+@dirrm smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix
>+@dirrm smlnj/lib/xml-lib.cm/.cm
>+@dirrm smlnj/lib/xml-lib.cm
> @dirrm smlnj/lib
> @dirrm smlnj

Actions: View | Diff

Attachments on bug 193431: 147015