Attachment #216956 for bug #248431

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

Lines 1-7 Link Here

(-)Makefile (-3 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= smlnj	3	PORTNAME= smlnj
4	PORTVERSION= 110.96	4	PORTVERSION= 110.98
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \	6	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
7	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 20-25 Link Here
20		20
21	ONLY_FOR_ARCHS= amd64 i386	21	ONLY_FOR_ARCHS= amd64 i386
22		22
		23	USES= compiler
		24
23	NO_WRKSUBDIR= yes	25	NO_WRKSUBDIR= yes
24		26
25	SUB_FILES= pkg-install	27	SUB_FILES= pkg-install
Lines 33-38 Link Here
33		35
34	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
35		37
		38	# XXX see FreeBSD PR 247421
		39	.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100
		40	RUNTIME_SO=
		41	PLIST_SUB+= RUNTIME_SO="@comment "
		42	.else
		43	RUNTIME_SO= "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so"
		44	PLIST_SUB+= RUNTIME_SO=
		45	.endif
		46
36	.if (${ARCH} == "i386")	47	.if (${ARCH} == "i386")
37	MLARCH= x86	48	MLARCH= x86
38	MLSIZE= 32	49	MLSIZE= 32
Lines 120-126 Link Here
120	.if defined(MLTARGETS)	131	.if defined(MLTARGETS)
121	${ECHO_CMD} -n > "${WRKDIR}/.tmp.sed"	132	${ECHO_CMD} -n > "${WRKDIR}/.tmp.sed"
122	.for t in ${MLTARGETS}	133	.for t in ${MLTARGETS}
123	${ECHO_CMD} '/^#request[ ]+${t}$$/s/^#//' >> "${WRKDIR}/.tmp.sed"	134	${ECHO_CMD} '/^#[ ]*request[ ]+${t}$$/s/^#//' >> "${WRKDIR}/.tmp.sed"
124	.endfor	135	.endfor
125	${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKSRC}/config/targets"	136	${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKSRC}/config/targets"
126	.endif	137	.endif
Lines 332-338 Link Here
332	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \	343	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
333	( eval $${MLARCHOPSYS} ; \	344	( eval $${MLARCHOPSYS} ; \
334	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" \	345	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" \
335	"${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" )	346	${RUNTIME_SO} )
336	.if ${PORT_OPTIONS:MEVERYTHING}	347	.if ${PORT_OPTIONS:MEVERYTHING}
337	@${ECHO} '(* Cleaning base/runtime: *)'	348	@${ECHO} '(* Cleaning base/runtime: *)'
338	cd ${WRKSRC}/base/runtime/objs && ${MAKE_CMD} clean	349	cd ${WRKSRC}/base/runtime/objs && ${MAKE_CMD} clean




TIMESTAMP = 1595416789
SHA256 (smlnj/110.98/MLRISC.tgz) = 208fb9c8cbcfc1c90ab14267e28038a390200002e2bcf3ee5670dcb643ceda11
SIZE (smlnj/110.98/MLRISC.tgz) = 1460273
SHA256 (smlnj/110.98/asdl.tgz) = c368bb213caa9b6c198b3cebabad577f3d01a64642046eaf9625ff403c49e59a
SIZE (smlnj/110.98/asdl.tgz) = 212714
SHA256 (smlnj/110.98/boot.amd64-unix.tgz) = 39e460e94063b3c85b944c86d29c91ce3995e6fab242a2f77c71d7b04c8e7a7a
SIZE (smlnj/110.98/boot.amd64-unix.tgz) = 5921092
SHA256 (smlnj/110.98/boot.x86-unix.tgz) = 1451adf5b9230aaf74d1d28438e4f8126dc56f333bb00b0fc52ff1b596a35281
SIZE (smlnj/110.98/boot.x86-unix.tgz) = 5912407
SHA256 (smlnj/110.98/ckit.tgz) = 17c4254b7c1e696591932bc46f1b390c05174b26927fdbab0fa6b0fd9b7baa1a
SIZE (smlnj/110.98/ckit.tgz) = 201005
SHA256 (smlnj/110.98/cm.tgz) = f02776bbe417d48a469abd8d3496ce87e6cd7fd8440101cb23ce3b28b8b0fba3
SIZE (smlnj/110.98/cm.tgz) = 220284
SHA256 (smlnj/110.98/cml.tgz) = 7ba1063146e419e1ecebfd420b45eeb641bb8f79802cfc45a0c7e3958ad59e4f
SIZE (smlnj/110.98/cml.tgz) = 104490
SHA256 (smlnj/110.98/compiler.tgz) = d7a7e6f9e32af242b3a600fd75830b923698db8f4d2318a7cc67512b01663344
SIZE (smlnj/110.98/compiler.tgz) = 1109928
SHA256 (smlnj/110.98/config.tgz) = 2ab4a5dff211d84359a50c5d48d607bd4c4f221fee65ac0bcf982f4508692e11
SIZE (smlnj/110.98/config.tgz) = 517538
SHA256 (smlnj/110.98/doc.tgz) = 74b7461bc7d1043f3ca1ba55bb64cbd6508b2b3e51c06e5b4eb9db819ec5aa34
SIZE (smlnj/110.98/doc.tgz) = 2424911
SHA256 (smlnj/110.98/eXene.tgz) = b48613fe9de6941899d26517cd9c1d4a5779d8a1816ce39d1441481bee8db7e7
SIZE (smlnj/110.98/eXene.tgz) = 721110
SHA256 (smlnj/110.98/heap2asm.tgz) = 6a6b4b33e765c0e5dad52232a544c16f1b632d532e2413c6838160beb610061a
SIZE (smlnj/110.98/heap2asm.tgz) = 1799
SHA256 (smlnj/110.98/ml-burg.tgz) = bd84ce5671fd1b1156f6779f81dfaabf0801e0c3f476f36e2f2fdb4311d496aa
SIZE (smlnj/110.98/ml-burg.tgz) = 40552
SHA256 (smlnj/110.98/ml-lex.tgz) = e47e0144547a04aaa2d4ee63bafb6a40a294e7acc8e072cc9569b9a08942ca86
SIZE (smlnj/110.98/ml-lex.tgz) = 28167
SHA256 (smlnj/110.98/ml-lpt.tgz) = 4055ea0bb388893a58453ff8588e1de72a15be94257715bcd66e7a870c08c3d8
SIZE (smlnj/110.98/ml-lpt.tgz) = 267606
SHA256 (smlnj/110.98/ml-yacc.tgz) = cf2c6cdbfae352585a59214d2e6a377191504334bf4dfc092e3a0e64667124a1
SIZE (smlnj/110.98/ml-yacc.tgz) = 101728
SHA256 (smlnj/110.98/nlffi.tgz) = fb6c671d071c31e50e6792fb015492d8aec6f12b0cea2cd00e0b303c8ce1d98f
SIZE (smlnj/110.98/nlffi.tgz) = 75095
SHA256 (smlnj/110.98/old-basis.tgz) = 2952d96a3f6fc9b63e7fdab998916588490ffb65214adf227cf8c3b737ddb17f
SIZE (smlnj/110.98/old-basis.tgz) = 1215
SHA256 (smlnj/110.98/pgraph.tgz) = 44f65f685627186e0bd334b1ce6d6bf85262673dfa2b8310e213a570c2216ebd
SIZE (smlnj/110.98/pgraph.tgz) = 5432
SHA256 (smlnj/110.98/runtime.tgz) = 36e9fff81baecf8f770efa20b5e56e6f67e71705d8692142d53a590c133183ba
SIZE (smlnj/110.98/runtime.tgz) = 336383
SHA256 (smlnj/110.98/smlnj-c.tgz) = caca7a72cc96f5ef00feaadc1ca1329a9e264c070363d88c22b58f0fd4f46b67
SIZE (smlnj/110.98/smlnj-c.tgz) = 10622
SHA256 (smlnj/110.98/smlnj-lib.tgz) = 63d25c1c38791ae6d8f34cfcff600bc4c4ad6a166adb8af6402105bd98e444ba
SIZE (smlnj/110.98/smlnj-lib.tgz) = 631261
SHA256 (smlnj/110.98/system.tgz) = 555950477c86c0c43b3b6bb7ef907d7690cd214fb19c09a1a735ec9be1dbfa1e
SIZE (smlnj/110.98/system.tgz) = 278110
SHA256 (smlnj/110.98/trace-debug-profile.tgz) = e494dc37e39bcdc1e506d5b3b31422488dfd0400184ca5fb7005438253d7fa17
SIZE (smlnj/110.98/trace-debug-profile.tgz) = 3936

Line 0 Link Here

(-)files/do-patch-asdl_config.sh (+13 lines)
	1	--- asdl/config.sh.orig 2019-10-27 12:44:07 UTC
	2	+++ asdl/config.sh
	3	@@ -40,4 +40,10 @@ fi
	4	SMLNJ_CMD=$INSTALLDIR/bin/sml
	5	export SMLNJ_CMD
	6
	7	+# "convert" gmake -> bmake
	8	+find . -name Makefile.in \| \
	9	+xargs sed -E -i "" \
	10	+ -e 's/^include[[:space:]]+(.+)/.include "\1"/' \
	11	+ -e 's@\$$patsubst %,%/([^,]+),\$\(([^)]+)$\)@${\2:C/(.+)\/\\1\\\/\1/}@' \
	12	+ -e 's@\$$patsubst %([^,]+),%([^,]+),\$\(([^)]+)$\)@${\3:C/\1/\2/}@'
	13	./configure $SIZE_OPT --prefix=$INSTALLDIR

Lines 1-10 Link Here

(-)files/do-patch-asdl_config_check__smlnj__heap__suffix.m4 (-10 lines)
1	--- asdl/config/check_smlnj_heap_suffix.m4.orig 2019-10-21 18:02:45 UTC
2	+++ asdl/config/check_smlnj_heap_suffix.m4
3	@@ -45,6 +45,7 @@ AC_DEFUN([CHECK_SMLNJ_HEAP_SUFFIX], [
4	sparc:solaris3*) SMLNJ_ARCH=sparc; SMLNJ_OPSYS=solaris;;
5	x86_64:linux*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=linux;;
6	x86_64:darwin*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=darwin;;
7	+ x86_64:freebsd*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=freebsd;;
8	*) $1 ;;
9	esac
10	if test z$SMLNJ_ARCH != z -a z$SMLNJ_OPSYS != z ; then




--- asdl/src/asdlgen/Makefile.in.orig	2019-12-22 02:16:49 UTC
+++ asdl/src/asdlgen/Makefile.in
@@ -60,8 +60,8 @@ CM_FILES =		back-end/sml/sources.cm \
 
 # if specified, include the size option as an argument to ml-build
 #
-ifneq (@HOSTSIZE@,)
+#ifneq (@HOSTSIZE@,)
+.if defined(@HOSTSIZE@)
 ML_BUILD_FLAGS +=	-@HOSTSIZE@
 ML_MAKEDEPEND_FLAGS +=	-@HOSTSIZE@
-endif
+.endif
 
 #
 # generator tools
@@ -62,8 +63,10 @@ CM_FILES =		back-end/sml/sources.cm \
 
 CODE_FRAG_DIRS =	back-end/sml
 
-CODE_FRAG_FILES =	$(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))
-CODE_FRAG_MKFILES =	$(patsubst %,%/fragments.gmk,$(CODE_FRAG_DIRS))
+#CODE_FRAG_FILES =	$(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))
+#CODE_FRAG_MKFILES =	$(patsubst %,%/fragments.gmk,$(CODE_FRAG_DIRS))
+CODE_FRAG_FILES =	${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.sml/}
+CODE_FRAG_MKFILES =	${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.gmk/}
 
 SRCDIR =		@ASDLGEN_SRCDIR@
 
@@ -100,14 +100,18 @@ back-end/sml/fragments.sml:
 	touch .depend
 	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) || rm -f .depend
 

 
 #################### Cleanup ####################
 
@@ -125,4 +129,4 @@ DISTCLEAN_FILES +=      Makefile \
 
 DEVCLEAN_FILES =
 
-include @ASDL_MKDIR@/clean-rules.gmk
+.include "@ASDL_MKDIR@/clean-rules.gmk"




--- base/runtime/objs/mk.amd64-freebsd.orig	2019-11-14 19:33:11 UTC
+++ base/runtime/objs/mk.amd64-freebsd
@@ -1,4 +1,4 @@
-# mk.amd64-freebst
+# mk.amd64-freebsd
 #
 # makefile for "Free BSD" on the amd64 architecture, which is a BSD 4.4 clone.
 #
@@ -6,9 +6,10 @@
 SHELL =		/bin/sh
 

-#	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
-#	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
+	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+	-($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
+	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Lines 18-25 Link Here

(-)files/do-patch-base_runtime_objs_mk.x86-freebsd (-3 / +3 lines)
18	-	18	-
19	XOBJS =	19	XOBJS =
20	XLIBS = ../c-libs/dl/libunix-dynload.a	20	XLIBS = ../c-libs/dl/libunix-dynload.a
21	-LD_LIBS =	21	-LD_LIBS = -lm
22	+LD_LIBS = -ldl	22	+LD_LIBS = -ldl -lm
23	+#CHECK_HEAP = check-heap.o	23	+#CHECK_HEAP = check-heap.o
24	+XDEFS = -DASSERT_ON	24	+XDEFS = -DASSERT_ON
25	BASE_DEFS =	25	BASE_DEFS =
Lines 39-43 Link Here
39	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))	39	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
40	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))	40	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
41	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))	41	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
42	+ ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))	42	+ -($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
43	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))	43	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Lines 1-11 Link Here

(-)files/do-patch-base_system_Basis_Implementation_date.sml (-11 lines)
1	--- base/system/Basis/Implementation/date.sml.orig 2019-06-12 21:16:48 UTC
2	+++ base/system/Basis/Implementation/date.sml
3	@@ -70,7 +70,7 @@ structure Date : DATE =
4	= wrap (CInterface.c_function "SMLNJ-Date" "strfTime")
5
6	(* conversions between integer numbers of seconds (used by runtime) and Time.time values *)
7	- fun nsToTime s = Time.fromSeconds (Word64.toLargeInt s)
8	+ fun nsToTime s = Time.fromNanoseconds (Word64.toLargeInt s)
9	fun timeToNs t = Word64.fromLargeInt (Time.toNanoseconds t)
10
11	val localTime = localTime' o timeToNs




--- smlnj-lib/JSON/json-parser.sml.orig	2011-05-10 18:58:08 UTC
+++ smlnj-lib/JSON/json-parser.sml
@@ -22,6 +22,26 @@ structure JSONParser : sig
 		  msg, ", found '", JSONTokens.toString tok, "'"
 		])
 	  val lexer = Lex.lex srcMap
+	  fun parse_sequence (is_tok_end, parse_item) (strm : Lex.strm, itms) = let
+		fun is_tok_sep tok = case tok of T.COMMA => true | _ => false
+		val (tok, pos, strm') = lexer strm
+		in if is_tok_sep tok
+		   then error (pos, "parsing sequence", tok)
+		   else if is_tok_end tok
+			then (strm', itms)
+			else let val (strm'', itm) = parse_item strm
+				 val (tok', pos', strm''') = lexer strm''
+			     in if is_tok_end tok'
+				then (strm''', itm :: itms)
+				else if is_tok_sep tok'
+				     then let val (tok'', pos'', _) = lexer strm'''
+					  in if is_tok_end tok''
+					     then error (pos'', "parsing sequence", tok'')
+					     else parse_sequence (is_tok_end, parse_item) (strm''', itm :: itms)
+					  end
+				     else error (pos', "parsing sequence", tok')
+				 end
+		end
 	  fun parseValue (strm : Lex.strm) = let
 		val (tok, pos, strm) = lexer strm
 		in
@@ -37,50 +57,29 @@ structure JSONParser : sig
 		    | _ => error (pos, "parsing value", tok)
 		  (* end case *)
 		end
-	  and parseArray (strm : Lex.strm) = (case lexer strm
-		 of (T.RB, _, strm) => (strm, J.ARRAY[])
-		  | _ => let
-		      fun loop (strm, items) = let
-			    val (strm, v) = parseValue strm
-			  (* expect either a "," or a "]" *)
-			    val (tok, pos, strm) = lexer strm
-			    in
-			      case tok
-			       of T.RB => (strm, v::items)
-				| T.COMMA => loop (strm, v::items)
-				| _ => error (pos, "parsing array", tok)
-			      (* end case *)
-			    end
-		      val (strm, items) = loop (strm, [])
-		      in
-			(strm, J.ARRAY(List.rev items))
-		      end
-		(* end case *))
+	  and parseArray (strm : Lex.strm) = let
+		fun is_RB tok = case tok of T.RB => true | _ => false
+		val (strm', elmnts) = parse_sequence (is_RB, parseValue) (strm, [])
+		in (strm', J.ARRAY(List.rev elmnts))
+		end
 	  and parseObject (strm : Lex.strm) = let
-		fun parseField strm = (case lexer strm
-		       of (T.STRING s, pos, strm) => (case lexer strm
-			     of (T.COLON, _, strm) => let
-				  val (strm, v) = parseValue strm
-				  in
-				    SOME(strm, (s, v))
-				  end
-			      | (tok, pos, _) => error (pos, "parsing field", tok)
-			    (* end case *))
-			| _ => NONE
-		      (* end case *))
-		fun loop (strm, flds) = (case parseField strm
-		       of SOME(strm, fld) => (
-			  (* expect either "," or "}" *)
-			    case lexer strm
-			     of (T.RCB, pos, strm) => (strm, fld::flds)
-			      | (T.COMMA, pos, strm) => loop (strm, fld::flds)
-			      | (tok, pos, _) => error (pos, "parsing object", tok)
-			    (* end case *))
-			| NONE => (strm, flds)
-		      (* end case *))
-		val (strm, flds) = loop (strm, [])
-		in
-		  (strm, J.OBJECT(List.rev flds))
+		fun is_RCB tok = case tok of T.RCB => true | _ => false
+		fun parse_field strm = let
+			val (tok, pos, strm') = lexer strm
+			in case tok
+			    of T.STRING s =>
+				(case lexer strm'
+				  of (T.COLON, _, strm'') => let
+					val (strm''', v) = parseValue strm''
+					in (strm''', (s, v))
+					end
+				   | (tok', pos', _) => error (pos', "parsing field", tok')
+				 (* end case *))
+			     | _ => error (pos, "parsing field", tok)
+			   (* end case *)
+			end
+		val (strm', flds) = parse_sequence (is_RCB, parse_field) (strm, [])
+		in (strm', J.OBJECT(List.rev flds))
 		end
 	  in
 	    #2 (parseValue (Lex.streamifyInstream inStrm))

Lines 1-25 Link Here

(-)files/do-patch-smlnj-lib_JSON_json-stream-printer.sml (-25 lines)
1	--- smlnj-lib/JSON/json-stream-printer.sml.orig 2017-07-14 20:32:40 UTC
2	+++ smlnj-lib/JSON/json-stream-printer.sml
3	@@ -103,14 +103,14 @@ structure JSONStreamPrinter : sig
4	fun tr (i, chrs) = (case getWChar i
5	of SOME(wchr, i) => if (wchr <= 0w126)
6	then (case UTF8.toAscii wchr
7	- of #"\"" => "\\\""
8	- \| #"\\" => "\\\\"
9	- \| #"/" => "\\/"
10	- \| #"\b" => "\\b"
11	- \| #"\f" => "\\f"
12	- \| #"\n" => "\\n"
13	- \| #"\r" => "\\r"
14	- \| #"\t" => "\\t"
15	+ of #"\"" => tr(i, "\\\"" :: chrs)
16	+ \| #"\\" => tr(i, "\\\\" :: chrs)
17	+ \| #"/" => tr(i, "\\/" :: chrs)
18	+ \| #"\b" => tr(i, "\\b" :: chrs)
19	+ \| #"\f" => tr(i, "\\f" :: chrs)
20	+ \| #"\n" => tr(i, "\\n" :: chrs)
21	+ \| #"\r" => tr(i, "\\r" :: chrs)
22	+ \| #"\t" => tr(i, "\\t" :: chrs)
23	\| c => if (wchr < 0w32)
24	then tr(i, F.format "\\u%04x" [F.WORD wchr] :: chrs)
25	else tr(i, str c :: chrs)




--- config/install.sh.orig	2020-04-03 02:04:40 UTC
+++ config/install.sh
@@ -56,11 +56,36 @@ if [ x"$SIZE_OPT" = x ] ; then
     SIZE_OPT="-"$DEFAULT_SIZE

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

 
 #
 # build the run-time system
@@ -416,9 +467,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
     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
@@ -430,7 +487,7 @@ else
 	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
@@ -456,7 +513,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
 	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
     fi
 else

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

 		    move $anchor "$LIBDIR"/$anchor
 		fi
 	    done
@@ -514,6 +571,18 @@ installdriver _ml-build ml-build
 
 cd "$ROOT"
 

 #
 # Now do all the rest using the precompiled installer
 # (see base/system/smlnj/installer for details)
@@ -523,6 +592,12 @@ if [ $nolib = false ] ; then
     export ROOT INSTALLDIR CONFIGDIR BINDIR
     CM_TOLERATE_TOOL_FAILURES=true
     export CM_TOLERATE_TOOL_FAILURES

+    [ -z "$STAGEDIR" ] || CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG
     if "$BINDIR"/sml $SIZE_OPT -m \$smlnj/installer.cm
     then
 	# because we create heap2exec without knowing if heap2asm is going
@@ -536,5 +611,20 @@ if [ $nolib = false ] ; then
 	complain "$this: !!! Installation of libraries and programs failed."
     fi
 fi

Lines 1-7 Link Here

(-)pkg-plist (-4 / +11 lines)
		1	man/man1/asdlgen.1.gz
		2	man/man1/heap2exec.1.gz
1	man/man1/ml-antlr.1.gz	3	man/man1/ml-antlr.1.gz
2	man/man1/ml-build.1.gz	4	man/man1/ml-build.1.gz
		5	man/man1/ml-burg.1.gz
		6	man/man1/ml-lex.1.gz
3	man/man1/ml-makedepend.1.gz	7	man/man1/ml-makedepend.1.gz
		8	man/man1/ml-nlffigen.1.gz
4	man/man1/ml-ulex.1.gz	9	man/man1/ml-ulex.1.gz
		10	man/man1/ml-yacc.1.gz
5	man/man1/sml.1.gz	11	man/man1/sml.1.gz
6	man/man7/smlnj.7.gz	12	man/man7/smlnj.7.gz
7	smlnj/bin/.arch-n-opsys	13	smlnj/bin/.arch-n-opsys
Lines 18-24 Link Here
18	smlnj/bin/.link-sml	24	smlnj/bin/.link-sml
19	smlnj/bin/.run/run.%%MLARCH%%-freebsd	25	smlnj/bin/.run/run.%%MLARCH%%-freebsd
20	smlnj/bin/.run/run.%%MLARCH%%-freebsd.a	26	smlnj/bin/.run/run.%%MLARCH%%-freebsd.a
21	smlnj/bin/.run/run.%%MLARCH%%-freebsd.so	27	%%RUNTIME_SO%%smlnj/bin/.run/run.%%MLARCH%%-freebsd.so
22	smlnj/bin/.run-sml	28	smlnj/bin/.run-sml
23	smlnj/bin/asdlgen	29	smlnj/bin/asdlgen
24	smlnj/bin/heap2asm	30	smlnj/bin/heap2asm
Lines 36-42 Link Here
36	smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix/basis-common.cm	42	smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix/basis-common.cm
37	smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix/basis.cm	43	smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix/basis.cm
38	smlnj/lib/SMLNJ-LIB/Controls/.cm/%%MLARCH%%-unix/controls-lib.cm	44	smlnj/lib/SMLNJ-LIB/Controls/.cm/%%MLARCH%%-unix/controls-lib.cm
39	smlnj/lib/SMLNJ-LIB/HTML/.cm/%%MLARCH%%-unix/html-lib.cm
40	smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm	45	smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm
41	smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm	46	smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm
42	smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm	47	smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
Lines 80-90 Link Here
80	smlnj/lib/cml/.cm/%%MLARCH%%-unix/unix-lib.cm	85	smlnj/lib/cml/.cm/%%MLARCH%%-unix/unix-lib.cm
81	smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm	86	smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
82	smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix/trace-cml.cm	87	smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix/trace-cml.cm
83	smlnj/lib/compiler/MiscUtil/const-arith/.cm/%%MLARCH%%-unix/sources.cm	88	smlnj/lib/compiler/Library/const-arith/.cm/%%MLARCH%%-unix/sources.cm
84	smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix/dir-tool.cm	89	smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix/dir-tool.cm
85	%%EVERYTHING%%smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix/eXene.cm	90	%%EVERYTHING%%smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix/eXene.cm
86	smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm	91	smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm
87	smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm	92	smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm
		93	smlnj/lib/html-lib.cm/.cm/%%MLARCH%%-unix/html-lib.cm
88	smlnj/lib/html4-lib.cm/.cm/%%MLARCH%%-unix/html4-lib.cm	94	smlnj/lib/html4-lib.cm/.cm/%%MLARCH%%-unix/html4-lib.cm
89	smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm	95	smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm
90	smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix/json-lib.cm	96	smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix/json-lib.cm
Lines 108-113 Link Here
108	%%EVERYTHING%%smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm	114	%%EVERYTHING%%smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm
109	smlnj/lib/pgraph.cm/.cm/%%MLARCH%%-unix/pgraph.cm	115	smlnj/lib/pgraph.cm/.cm/%%MLARCH%%-unix/pgraph.cm
110	smlnj/lib/pickle-lib.cm/.cm/%%MLARCH%%-unix/pickle-lib.cm	116	smlnj/lib/pickle-lib.cm/.cm/%%MLARCH%%-unix/pickle-lib.cm
		117	smlnj/lib/pp-extras-lib.cm/.cm/%%MLARCH%%-unix/pp-extras-lib.cm
111	smlnj/lib/reactive-lib.cm/.cm/%%MLARCH%%-unix/reactive-lib.cm	118	smlnj/lib/reactive-lib.cm/.cm/%%MLARCH%%-unix/reactive-lib.cm
112	smlnj/lib/regexp-lib.cm/.cm/%%MLARCH%%-unix/regexp-lib.cm	119	smlnj/lib/regexp-lib.cm/.cm/%%MLARCH%%-unix/regexp-lib.cm
113	smlnj/lib/sexp-lib.cm/.cm/%%MLARCH%%-unix/sexp-lib.cm	120	smlnj/lib/sexp-lib.cm/.cm/%%MLARCH%%-unix/sexp-lib.cm
Lines 158-164 Link Here
158	smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/srcpath-lib.cm	165	smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/srcpath-lib.cm
159	smlnj/lib/smlnj/ml-yacc/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm	166	smlnj/lib/smlnj/ml-yacc/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
160	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/controls-lib.cm	167	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/controls-lib.cm
161	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/html-lib.cm
162	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm	168	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm
163	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm	169	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
164	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm	170	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm
Lines 173-176 Link Here
173	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm	179	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm
174	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm	180	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm
175	smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm	181	smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
		182	smlnj/lib/uuid-lib.cm/.cm/%%MLARCH%%-unix/uuid-lib.cm
176	smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix/xml-lib.cm	183	smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix/xml-lib.cm

Return to bug 248431

Lines 1-49 Link Here

(-)distinfo (-49 / +49 lines)
1	TIMESTAMP = 1576341142	1	TIMESTAMP = 1595416789
2	SHA256 (smlnj/110.96/MLRISC.tgz) = 193c29217e592d3e5a67cd0bde14ebfed2a2c3e4bcfae1e151e8fbe148fbe69e	2	SHA256 (smlnj/110.98/MLRISC.tgz) = 208fb9c8cbcfc1c90ab14267e28038a390200002e2bcf3ee5670dcb643ceda11
3	SIZE (smlnj/110.96/MLRISC.tgz) = 1460365	3	SIZE (smlnj/110.98/MLRISC.tgz) = 1460273
4	SHA256 (smlnj/110.96/asdl.tgz) = 2a521d8ba66ba1f2fc1c4b315bd43567ece21969026ce45b6f50d9132726724e	4	SHA256 (smlnj/110.98/asdl.tgz) = c368bb213caa9b6c198b3cebabad577f3d01a64642046eaf9625ff403c49e59a
5	SIZE (smlnj/110.96/asdl.tgz) = 205907	5	SIZE (smlnj/110.98/asdl.tgz) = 212714
6	SHA256 (smlnj/110.96/boot.amd64-unix.tgz) = 605a118476d251bd77e312f303df3039adea6ace521d9ac140e2187b904ec807	6	SHA256 (smlnj/110.98/boot.amd64-unix.tgz) = 39e460e94063b3c85b944c86d29c91ce3995e6fab242a2f77c71d7b04c8e7a7a
7	SIZE (smlnj/110.96/boot.amd64-unix.tgz) = 6031590	7	SIZE (smlnj/110.98/boot.amd64-unix.tgz) = 5921092
8	SHA256 (smlnj/110.96/boot.x86-unix.tgz) = ab08f260137fb68492d747b96d5be8ce49e8eda55a358094fd9018efd32341bd	8	SHA256 (smlnj/110.98/boot.x86-unix.tgz) = 1451adf5b9230aaf74d1d28438e4f8126dc56f333bb00b0fc52ff1b596a35281
9	SIZE (smlnj/110.96/boot.x86-unix.tgz) = 6034356	9	SIZE (smlnj/110.98/boot.x86-unix.tgz) = 5912407
10	SHA256 (smlnj/110.96/ckit.tgz) = 8b9301e3a2975be6877ce22edc27445630d57f51afbb77a950f386c9b3193bbf	10	SHA256 (smlnj/110.98/ckit.tgz) = 17c4254b7c1e696591932bc46f1b390c05174b26927fdbab0fa6b0fd9b7baa1a
11	SIZE (smlnj/110.96/ckit.tgz) = 201009	11	SIZE (smlnj/110.98/ckit.tgz) = 201005
12	SHA256 (smlnj/110.96/cm.tgz) = 19e4f8096f5c8af64f20e57c5b48dacf9054c90ec14db4908a9e8c5bc505c568	12	SHA256 (smlnj/110.98/cm.tgz) = f02776bbe417d48a469abd8d3496ce87e6cd7fd8440101cb23ce3b28b8b0fba3
13	SIZE (smlnj/110.96/cm.tgz) = 220256	13	SIZE (smlnj/110.98/cm.tgz) = 220284
14	SHA256 (smlnj/110.96/cml.tgz) = ec2b2d08343a32d911f30f34fb506fd0fed21b21378592e568107a68abc6ed8a	14	SHA256 (smlnj/110.98/cml.tgz) = 7ba1063146e419e1ecebfd420b45eeb641bb8f79802cfc45a0c7e3958ad59e4f
15	SIZE (smlnj/110.96/cml.tgz) = 105379	15	SIZE (smlnj/110.98/cml.tgz) = 104490
16	SHA256 (smlnj/110.96/compiler.tgz) = 1382181001e0cf8d751c3d1707331f305e1ab3e41ca07af1349a73ef16df4a4c	16	SHA256 (smlnj/110.98/compiler.tgz) = d7a7e6f9e32af242b3a600fd75830b923698db8f4d2318a7cc67512b01663344
17	SIZE (smlnj/110.96/compiler.tgz) = 848920	17	SIZE (smlnj/110.98/compiler.tgz) = 1109928
18	SHA256 (smlnj/110.96/config.tgz) = b2bda33c1fb1472b4ca69827463b1b1b7b8a86bed72db959a558d9e4fe65de18	18	SHA256 (smlnj/110.98/config.tgz) = 2ab4a5dff211d84359a50c5d48d607bd4c4f221fee65ac0bcf982f4508692e11
19	SIZE (smlnj/110.96/config.tgz) = 517305	19	SIZE (smlnj/110.98/config.tgz) = 517538
20	SHA256 (smlnj/110.96/doc.tgz) = 24243d3a58b50973d151304f878bd2e80a6ce71cefced114cb694b89e039641a	20	SHA256 (smlnj/110.98/doc.tgz) = 74b7461bc7d1043f3ca1ba55bb64cbd6508b2b3e51c06e5b4eb9db819ec5aa34
21	SIZE (smlnj/110.96/doc.tgz) = 2134988	21	SIZE (smlnj/110.98/doc.tgz) = 2424911
22	SHA256 (smlnj/110.96/eXene.tgz) = 0c5d642c57380b0a427d4ce9f6af84c2bb76859089b36a4f5da3a2149d7fb2bf	22	SHA256 (smlnj/110.98/eXene.tgz) = b48613fe9de6941899d26517cd9c1d4a5779d8a1816ce39d1441481bee8db7e7
23	SIZE (smlnj/110.96/eXene.tgz) = 721127	23	SIZE (smlnj/110.98/eXene.tgz) = 721110
24	SHA256 (smlnj/110.96/heap2asm.tgz) = 1cb94d9ba56c58cb122f7f9d548824e6a7fed155acd17ac4d10fb028ca7a4a50	24	SHA256 (smlnj/110.98/heap2asm.tgz) = 6a6b4b33e765c0e5dad52232a544c16f1b632d532e2413c6838160beb610061a
25	SIZE (smlnj/110.96/heap2asm.tgz) = 1395	25	SIZE (smlnj/110.98/heap2asm.tgz) = 1799
26	SHA256 (smlnj/110.96/ml-burg.tgz) = 4286a4aa01f2063bdbea10ab1c7299b7a41a4a822a96d4a040ce404b1b3276b1	26	SHA256 (smlnj/110.98/ml-burg.tgz) = bd84ce5671fd1b1156f6779f81dfaabf0801e0c3f476f36e2f2fdb4311d496aa
27	SIZE (smlnj/110.96/ml-burg.tgz) = 40552	27	SIZE (smlnj/110.98/ml-burg.tgz) = 40552
28	SHA256 (smlnj/110.96/ml-lex.tgz) = 02971b9026d2c6df8b425b8ac78c4065439a62e09b36fc974a98b5062874b8f0	28	SHA256 (smlnj/110.98/ml-lex.tgz) = e47e0144547a04aaa2d4ee63bafb6a40a294e7acc8e072cc9569b9a08942ca86
29	SIZE (smlnj/110.96/ml-lex.tgz) = 27879	29	SIZE (smlnj/110.98/ml-lex.tgz) = 28167
30	SHA256 (smlnj/110.96/ml-lpt.tgz) = 3736cd60daad7510467ee2f31462cffbb43890bc4499b3efc7d671829f68e141	30	SHA256 (smlnj/110.98/ml-lpt.tgz) = 4055ea0bb388893a58453ff8588e1de72a15be94257715bcd66e7a870c08c3d8
31	SIZE (smlnj/110.96/ml-lpt.tgz) = 267441	31	SIZE (smlnj/110.98/ml-lpt.tgz) = 267606
32	SHA256 (smlnj/110.96/ml-yacc.tgz) = 3a8d4d345ec3832b30bde1a7b0c0f97f209f40afd80e6ff6e1c78f365a77b0e9	32	SHA256 (smlnj/110.98/ml-yacc.tgz) = cf2c6cdbfae352585a59214d2e6a377191504334bf4dfc092e3a0e64667124a1
33	SIZE (smlnj/110.96/ml-yacc.tgz) = 101727	33	SIZE (smlnj/110.98/ml-yacc.tgz) = 101728
34	SHA256 (smlnj/110.96/nlffi.tgz) = fb08f68da401382396fe0cb676b0f81eda27e9360c69fbeb3d473dec3452e8ee	34	SHA256 (smlnj/110.98/nlffi.tgz) = fb6c671d071c31e50e6792fb015492d8aec6f12b0cea2cd00e0b303c8ce1d98f
35	SIZE (smlnj/110.96/nlffi.tgz) = 75084	35	SIZE (smlnj/110.98/nlffi.tgz) = 75095
36	SHA256 (smlnj/110.96/old-basis.tgz) = c3fea6a6b14d3c4cfad92944bd259f6b104a76f4b7ee8dd999275dcab8336199	36	SHA256 (smlnj/110.98/old-basis.tgz) = 2952d96a3f6fc9b63e7fdab998916588490ffb65214adf227cf8c3b737ddb17f
37	SIZE (smlnj/110.96/old-basis.tgz) = 1215	37	SIZE (smlnj/110.98/old-basis.tgz) = 1215
38	SHA256 (smlnj/110.96/pgraph.tgz) = 73f0a34fc2ac5ec9ba1aa10bb732300b0aea0a63d32154c108ce42b28d1d72a6	38	SHA256 (smlnj/110.98/pgraph.tgz) = 44f65f685627186e0bd334b1ce6d6bf85262673dfa2b8310e213a570c2216ebd
39	SIZE (smlnj/110.96/pgraph.tgz) = 5430	39	SIZE (smlnj/110.98/pgraph.tgz) = 5432
40	SHA256 (smlnj/110.96/runtime.tgz) = 46ab1f6f4282ab46f117f8b8673e70180b8b4cbc6d9afdfa305aa8510258bf69	40	SHA256 (smlnj/110.98/runtime.tgz) = 36e9fff81baecf8f770efa20b5e56e6f67e71705d8692142d53a590c133183ba
41	SIZE (smlnj/110.96/runtime.tgz) = 336178	41	SIZE (smlnj/110.98/runtime.tgz) = 336383
42	SHA256 (smlnj/110.96/smlnj-c.tgz) = 3c1064ba53990abf278ebe80f68b62dad14d9f6a044ac72c6f2cf602c6aaa28c	42	SHA256 (smlnj/110.98/smlnj-c.tgz) = caca7a72cc96f5ef00feaadc1ca1329a9e264c070363d88c22b58f0fd4f46b67
43	SIZE (smlnj/110.96/smlnj-c.tgz) = 10620	43	SIZE (smlnj/110.98/smlnj-c.tgz) = 10622
44	SHA256 (smlnj/110.96/smlnj-lib.tgz) = 7ff7e8008bc08f32f2080e83afa7c609171d9856ec46fcccaec7f44c309057fb	44	SHA256 (smlnj/110.98/smlnj-lib.tgz) = 63d25c1c38791ae6d8f34cfcff600bc4c4ad6a166adb8af6402105bd98e444ba
45	SIZE (smlnj/110.96/smlnj-lib.tgz) = 457923	45	SIZE (smlnj/110.98/smlnj-lib.tgz) = 631261
46	SHA256 (smlnj/110.96/system.tgz) = 8f33d350c4027e326f4b910cba2c50ae215a0b6ce93fed380b02f48c19ce3161	46	SHA256 (smlnj/110.98/system.tgz) = 555950477c86c0c43b3b6bb7ef907d7690cd214fb19c09a1a735ec9be1dbfa1e
47	SIZE (smlnj/110.96/system.tgz) = 274076	47	SIZE (smlnj/110.98/system.tgz) = 278110
48	SHA256 (smlnj/110.96/trace-debug-profile.tgz) = 5f24d0ae00fb8dde2cec660ca66395fcfcc417ee56faec7f5f420af18cabb80d	48	SHA256 (smlnj/110.98/trace-debug-profile.tgz) = e494dc37e39bcdc1e506d5b3b31422488dfd0400184ca5fb7005438253d7fa17
49	SIZE (smlnj/110.96/trace-debug-profile.tgz) = 3935	49	SIZE (smlnj/110.98/trace-debug-profile.tgz) = 3936

Lines 1-33 Link Here

(-)files/do-patch-asdl_src_asdlgen_Makefile.in (-19 / +9 lines)
1	--- asdl/src/asdlgen/Makefile.in.orig 2019-10-21 18:02:45 UTC	1	--- asdl/src/asdlgen/Makefile.in.orig 2019-12-22 02:16:49 UTC
2	+++ asdl/src/asdlgen/Makefile.in	2	+++ asdl/src/asdlgen/Makefile.in
3	@@ -35,10 +35,11 @@ INSTALL_WRAPPER = @ASDL_ROOT@/bin/install-sml-wrapper.	3	@@ -60,8 +60,8 @@ CM_FILES = back-end/sml/sources.cm \
4		4
5	# if specified, include the size option as an argument to ml-build
6	#
7	-ifneq (@HOSTSIZE@,)
8	+#ifneq (@HOSTSIZE@,)
9	+.if defined(@HOSTSIZE@)
10	ML_BUILD_FLAGS += -@HOSTSIZE@
11	ML_MAKEDEPEND_FLAGS += -@HOSTSIZE@
12	-endif
13	+.endif
14
15	#
16	# generator tools
17	@@ -62,8 +63,10 @@ CM_FILES = back-end/sml/sources.cm \
18
19	CODE_FRAG_DIRS = back-end/sml	5	CODE_FRAG_DIRS = back-end/sml
20		6
21	-CODE_FRAG_FILES = $(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))	7	-CODE_FRAG_FILES = $(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))
22	-CODE_FRAG_MKFILES = $(patsubst %,%/fragments.gmk,$(CODE_FRAG_DIRS))	8	-CODE_FRAG_MKFILES = $(patsubst %,%/fragments.gmk,$(CODE_FRAG_DIRS))
23	+#CODE_FRAG_FILES = $(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))
24	+#CODE_FRAG_MKFILES = $(patsubst %,%/fragments.gmk,$(CODE_FRAG_DIRS))
25	+CODE_FRAG_FILES = ${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.sml/}	9	+CODE_FRAG_FILES = ${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.sml/}
26	+CODE_FRAG_MKFILES = ${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.gmk/}	10	+CODE_FRAG_MKFILES = ${CODE_FRAG_DIRS:C/(.+)/\1\/fragments.gmk/}
27		11
28	SRCDIR = @ASDLGEN_SRCDIR@	12	SRCDIR = @ASDLGEN_SRCDIR@
29		13
30	@@ -102,14 +105,18 @@ back-end/sml/fragments.sml:	14	@@ -100,14 +100,18 @@ back-end/sml/fragments.sml:
31	touch .depend	15	touch .depend
32	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) \|\| rm -f .depend	16	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) \|\| rm -f .depend
33		17
Lines 54-56 Link Here
54		38
55	#################### Cleanup ####################	39	#################### Cleanup ####################
56		40
		41	@@ -125,4 +129,4 @@ DISTCLEAN_FILES += Makefile \
		42
		43	DEVCLEAN_FILES =
		44
		45	-include @ASDL_MKDIR@/clean-rules.gmk
		46	+.include "@ASDL_MKDIR@/clean-rules.gmk"

Lines 1-11 Link Here

(-)files/do-patch-base_runtime_objs_mk.amd64-freebsd (-7 / +1 lines)
1	--- base/runtime/objs/mk.amd64-freebsd.orig 2019-11-14 19:33:11 UTC	1	--- base/runtime/objs/mk.amd64-freebsd.orig 2019-11-14 19:33:11 UTC
2	+++ base/runtime/objs/mk.amd64-freebsd	2	+++ base/runtime/objs/mk.amd64-freebsd
3	@@ -1,4 +1,4 @@
4	-# mk.amd64-freebst
5	+# mk.amd64-freebsd
6	#
7	# makefile for "Free BSD" on the amd64 architecture, which is a BSD 4.4 clone.
8	#
9	@@ -6,9 +6,10 @@	3	@@ -6,9 +6,10 @@
10	SHELL = /bin/sh	4	SHELL = /bin/sh
11		5
Lines 28-32 Link Here
28	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))	22	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
29	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))	23	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
30	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))	24	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
31	+ ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))	25	+ -($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
32	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))	26	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Lines 1-102 Link Here

(-)files/do-patch-smlnj-lib_JSON_json-parser.sml (-102 lines)
1	--- smlnj-lib/JSON/json-parser.sml.orig 2011-05-10 18:58:08 UTC
2	+++ smlnj-lib/JSON/json-parser.sml
3	@@ -22,6 +22,26 @@ structure JSONParser : sig
4	msg, ", found '", JSONTokens.toString tok, "'"
5	])
6	val lexer = Lex.lex srcMap
7	+ fun parse_sequence (is_tok_end, parse_item) (strm : Lex.strm, itms) = let
8	+ fun is_tok_sep tok = case tok of T.COMMA => true \| _ => false
9	+ val (tok, pos, strm') = lexer strm
10	+ in if is_tok_sep tok
11	+ then error (pos, "parsing sequence", tok)
12	+ else if is_tok_end tok
13	+ then (strm', itms)
14	+ else let val (strm'', itm) = parse_item strm
15	+ val (tok', pos', strm''') = lexer strm''
16	+ in if is_tok_end tok'
17	+ then (strm''', itm :: itms)
18	+ else if is_tok_sep tok'
19	+ then let val (tok'', pos'', _) = lexer strm'''
20	+ in if is_tok_end tok''
21	+ then error (pos'', "parsing sequence", tok'')
22	+ else parse_sequence (is_tok_end, parse_item) (strm''', itm :: itms)
23	+ end
24	+ else error (pos', "parsing sequence", tok')
25	+ end
26	+ end
27	fun parseValue (strm : Lex.strm) = let
28	val (tok, pos, strm) = lexer strm
29	in
30	@@ -37,50 +57,29 @@ structure JSONParser : sig
31	\| _ => error (pos, "parsing value", tok)
32	(* end case *)
33	end
34	- and parseArray (strm : Lex.strm) = (case lexer strm
35	- of (T.RB, _, strm) => (strm, J.ARRAY[])
36	- \| _ => let
37	- fun loop (strm, items) = let
38	- val (strm, v) = parseValue strm
39	- (* expect either a "," or a "]" *)
40	- val (tok, pos, strm) = lexer strm
41	- in
42	- case tok
43	- of T.RB => (strm, v::items)
44	- \| T.COMMA => loop (strm, v::items)
45	- \| _ => error (pos, "parsing array", tok)
46	- (* end case *)
47	- end
48	- val (strm, items) = loop (strm, [])
49	- in
50	- (strm, J.ARRAY(List.rev items))
51	- end
52	- (* end case *))
53	+ and parseArray (strm : Lex.strm) = let
54	+ fun is_RB tok = case tok of T.RB => true \| _ => false
55	+ val (strm', elmnts) = parse_sequence (is_RB, parseValue) (strm, [])
56	+ in (strm', J.ARRAY(List.rev elmnts))
57	+ end
58	and parseObject (strm : Lex.strm) = let
59	- fun parseField strm = (case lexer strm
60	- of (T.STRING s, pos, strm) => (case lexer strm
61	- of (T.COLON, _, strm) => let
62	- val (strm, v) = parseValue strm
63	- in
64	- SOME(strm, (s, v))
65	- end
66	- \| (tok, pos, _) => error (pos, "parsing field", tok)
67	- (* end case *))
68	- \| _ => NONE
69	- (* end case *))
70	- fun loop (strm, flds) = (case parseField strm
71	- of SOME(strm, fld) => (
72	- (* expect either "," or "}" *)
73	- case lexer strm
74	- of (T.RCB, pos, strm) => (strm, fld::flds)
75	- \| (T.COMMA, pos, strm) => loop (strm, fld::flds)
76	- \| (tok, pos, _) => error (pos, "parsing object", tok)
77	- (* end case *))
78	- \| NONE => (strm, flds)
79	- (* end case *))
80	- val (strm, flds) = loop (strm, [])
81	- in
82	- (strm, J.OBJECT(List.rev flds))
83	+ fun is_RCB tok = case tok of T.RCB => true \| _ => false
84	+ fun parse_field strm = let
85	+ val (tok, pos, strm') = lexer strm
86	+ in case tok
87	+ of T.STRING s =>
88	+ (case lexer strm'
89	+ of (T.COLON, _, strm'') => let
90	+ val (strm''', v) = parseValue strm''
91	+ in (strm''', (s, v))
92	+ end
93	+ \| (tok', pos', _) => error (pos', "parsing field", tok')
94	+ (* end case *))
95	+ \| _ => error (pos, "parsing field", tok)
96	+ (* end case *)
97	+ end
98	+ val (strm', flds) = parse_sequence (is_RCB, parse_field) (strm, [])
99	+ in (strm', J.OBJECT(List.rev flds))
100	end
101	in
102	#2 (parseValue (Lex.streamifyInstream inStrm))

Lines 1-4 Link Here

(-)files/patch-config_install.sh (-10 / +10 lines)
1	--- config/install.sh.orig 2019-11-23 16:06:59 UTC	1	--- config/install.sh.orig 2020-04-03 02:04:40 UTC
2	+++ config/install.sh	2	+++ config/install.sh
3	@@ -56,11 +56,36 @@ if [ x"$SIZE_OPT" = x ] ; then	3	@@ -56,11 +56,36 @@ if [ x"$SIZE_OPT" = x ] ; then
4	SIZE_OPT="-"$DEFAULT_SIZE	4	SIZE_OPT="-"$DEFAULT_SIZE
Lines 67-73 Link Here
67	#	67	#
68	# the release version that we are installing	68	# the release version that we are installing
69	#	69	#
70	@@ -403,7 +449,12 @@ esac	70	@@ -407,7 +453,12 @@ esac
71	# the name of the bin files directory	71	# the name of the bin files directory
72	#	72	#
73	BOOT_ARCHIVE=boot.$ARCH-unix	73	BOOT_ARCHIVE=boot.$ARCH-unix
Lines 81-87 Link Here
81		81
82	#	82	#
83	# build the run-time system	83	# build the run-time system
84	@@ -412,9 +463,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then	84	@@ -416,9 +467,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
85	vsay $this: Run-time system already exists.	85	vsay $this: Run-time system already exists.
86	else	86	else
87	"$CONFIGDIR"/unpack "$ROOT" runtime	87	"$CONFIGDIR"/unpack "$ROOT" runtime
Lines 98-104 Link Here
98	if [ -x run.$ARCH-$OPSYS ]; then	98	if [ -x run.$ARCH-$OPSYS ]; then
99	mv run.$ARCH-$OPSYS "$RUNDIR"	99	mv run.$ARCH-$OPSYS "$RUNDIR"
100	if [ -f runx.$ARCH-$OPSYS ]; then	100	if [ -f runx.$ARCH-$OPSYS ]; then
101	@@ -426,7 +483,7 @@ else	101	@@ -430,7 +487,7 @@ else
102	if [ -f run.$ARCH-$OPSYS.a ]; then	102	if [ -f run.$ARCH-$OPSYS.a ]; then
103	mv run.$ARCH-$OPSYS.a "$RUNDIR"	103	mv run.$ARCH-$OPSYS.a "$RUNDIR"
104	fi	104	fi
Lines 107-113 Link Here
107	else	107	else
108	complain "$this: !!! Run-time system build failed for some reason."	108	complain "$this: !!! Run-time system build failed for some reason."
109	fi	109	fi
110	@@ -452,7 +509,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then	110	@@ -456,7 +513,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
111	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."	111	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
112	fi	112	fi
113	else	113	else
Lines 116-122 Link Here
116		116
117	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis	117	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
118		118
119	@@ -487,7 +544,7 @@ else	119	@@ -491,7 +548,7 @@ else
120	cd "$ROOT"/"$BOOT_FILES"	120	cd "$ROOT"/"$BOOT_FILES"
121	for anchor in * ; do	121	for anchor in * ; do
122	if [ -d $anchor ] ; then	122	if [ -d $anchor ] ; then
Lines 125-131 Link Here
125	move $anchor "$LIBDIR"/$anchor	125	move $anchor "$LIBDIR"/$anchor
126	fi	126	fi
127	done	127	done
128	@@ -510,6 +567,18 @@ installdriver _ml-build ml-build	128	@@ -514,6 +571,18 @@ installdriver _ml-build ml-build
129		129
130	cd "$ROOT"	130	cd "$ROOT"
131		131
Lines 144-150 Link Here
144	#	144	#
145	# Now do all the rest using the precompiled installer	145	# Now do all the rest using the precompiled installer
146	# (see base/system/smlnj/installer for details)	146	# (see base/system/smlnj/installer for details)
147	@@ -519,6 +588,12 @@ if [ $nolib = false ] ; then	147	@@ -523,6 +592,12 @@ if [ $nolib = false ] ; then
148	export ROOT INSTALLDIR CONFIGDIR BINDIR	148	export ROOT INSTALLDIR CONFIGDIR BINDIR
149	CM_TOLERATE_TOOL_FAILURES=true	149	CM_TOLERATE_TOOL_FAILURES=true
150	export CM_TOLERATE_TOOL_FAILURES	150	export CM_TOLERATE_TOOL_FAILURES
Lines 156-163 Link Here
156	+ [ -z "$STAGEDIR" ] \|\| CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG	156	+ [ -z "$STAGEDIR" ] \|\| CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG
157	if "$BINDIR"/sml $SIZE_OPT -m \$smlnj/installer.cm	157	if "$BINDIR"/sml $SIZE_OPT -m \$smlnj/installer.cm
158	then	158	then
159	vsay $this: Installation complete.	159	# because we create heap2exec without knowing if heap2asm is going
160	@@ -526,5 +601,20 @@ if [ $nolib = false ] ; then	160	@@ -536,5 +611,20 @@ if [ $nolib = false ] ; then
161	complain "$this: !!! Installation of libraries and programs failed."	161	complain "$this: !!! Installation of libraries and programs failed."
162	fi	162	fi
163	fi	163	fi