- Update to 110.71

PR:		139807
Submitted by:	Johannes 5 Joemann <joemann@beefree.free.de> (maintainer)

5 files changed, 136 insertions, 99 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index b6ae69912513..1a16af72ad64 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.65
+PORTVERSION=	110.71
 CATEGORIES=	lang
 MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
 		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
@@ -24,7 +24,8 @@ USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
 
 OPTIONS=	EVERYTHING "install everything from the SML/NJ distribution" off \
-		RECOMPILE "recompile the SML compiler - implies EVERYTHING" off
+		RECOMPILE  "recompile the SML compiler - implies EVERYTHING" off \
+		POSITION64 "use 64bit fi""le positions - implies RECOMPILE"  off
 
 SUB_FILES=	pkg-install
 SUB_LIST=	EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"
@@ -44,6 +45,13 @@ DISTFILES+=	MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz ml-lpt.tgz \
 
 PLIST_SUB=	MLARCH=${MLARCH}
 
+.if defined(WITH_POSITION64)
+WITH_RECOMPILE?=	${WITH_POSITION64}
+CMB_COMMAND=	'(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
+.else
+CMB_COMMAND=
+.endif
+
 .if defined(WITH_RECOMPILE)
 WITH_EVERYTHING?=	${WITH_RECOMPILE}
 .endif
@@ -58,8 +66,9 @@ MLROOT=		${PREFIX}/${MLROOTRELATIVE}
 MLBINRELATIVE=	${MLROOTRELATIVE}/bin
 MLBIN=		${MLROOT}/bin
 MLLIB=		${MLROOT}/lib
-MLSRCDIRS=	base ckit cml eXene heap2asm ml-burg ml-lex ml-lpt \
-		ml-yacc nlffi pgraph smlnj-c smlnj-lib
+MLSTDSRCDIRS=	cml heap2asm ml-lex ml-lpt ml-yacc smlnj-lib
+MLSRCDIRS=	base ${MLSTDSRCDIRS} \
+		ckit eXene ml-burg nlffi pgraph smlnj-c
 MLSRCS=
 .for srcdir in ${MLSRCDIRS}
 MLSRCS+=	${MLROOT}/${srcdir}
@@ -92,6 +101,10 @@ pre-fetch:
 	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
 	@${ECHO} ' This implies WITH_EVERYTHING.'
 .endif
+.if !defined(WITH_POSITION64)
+	@${ECHO} 'Use make WITH_POSITION64=yes to use 64bit file positions.'
+	@${ECHO} ' This implies WITH_RECOMPILE.'
+.endif
 	@${ECHO}
 
 # make symlinks to the dist files
@@ -134,34 +147,41 @@ RECOMPILEDIR=	base/system
 RECOMPILEDIR=
 .endif
 
-# calm portlint complaining about /dev/null
-AUXSLASH=	/
-AUXDEV=		${AUXSLASH}dev
-AUXDEVNULL!=	if [ -w ${AUXDEV}/null ]; then ${ECHO_CMD} -n ${AUXDEV}/null; \
-		else ${ECHO_CMD} -n '${WRKDIR}/.devnull'; fi
-
-MLRUNTIMEPATCHES!=	cd ${FILESDIR} && \
-			( ${LS} do-patch-base_runtime_* 2> ${AUXDEVNULL} || \
+MLRUNTIMEPATCHES_CMD=	cd ${FILESDIR} && \
+			( ${LS} do-patch-base_runtime_* 2>&- || \
 			  ${TRUE} )
+MLSTANDARDPATCHES_CMD=	cd ${FILESDIR} && \
+			( for srcdir in ${MLSTDSRCDIRS} ; \
+			  do ${LS} do-patch-$${srcdir}_* 2>&- ; \
+			  done ) || ${TRUE}
+MLSTANDARDPATCHDIRS_CMD=	cd ${FILESDIR} && \
+			( for srcdir in ${MLSTDSRCDIRS} ; \
+			  do if ${LS} do-patch-$${srcdir}_* 1>&- 2>&- ; \
+			     then ${ECHO_CMD} -n $${srcdir} " " ; break ; fi ; \
+			  done ) || ${TRUE}
 .if defined(WITH_EVERYTHING)
-MLSOURCEPATCHES!=	cd ${FILESDIR} && \
-			( ${LS} do-patch-* 2> ${AUXDEVNULL} || \
+MLSOURCEPATCHES_CMD=	cd ${FILESDIR} && \
+			( ${LS} do-patch-* 2>&- || \
 			  ${TRUE} )
 .else
-MLSOURCEPATCHES=
+MLSOURCEPATCHES_CMD=	${TRUE}
 .endif
 
 do-build:
 	cd ${WRKDIR} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	MLNORUNTIMECLEAN=yes \
-	MLRUNTIMEPATCHES="${MLRUNTIMEPATCHES}" \
-	MLSOURCEPATCHES="${MLSOURCEPATCHES}"	./config/install.sh
+	MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \
+	MLSTANDARDPATCHES=`${MLSTANDARDPATCHES_CMD}` \
+	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
+	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
+	./config/install.sh
 .if defined(WITH_RECOMPILE)
 	-${RM} ${WRKDIR}/config/targets.customized
 	@${ECHO} '(* Recompiling the core system: *)'
 	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+	${ECHO_CMD} ${CMB_COMMAND} ; \
 	${ECHO_CMD} 'CMB.make ();' ) | \
 	../../bin/sml
 	@${ECHO} '(* Building the recompiled heap: *)'
@@ -205,12 +225,10 @@ pre-install:
 	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
 		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
 		> ${MLRUNTIMEPLIST}
-.for p in ${MLRUNTIMEPATCHES}
-	@${ECHO_CMD} '${p}' | \
+	`${MLRUNTIMEPATCHES_CMD}` | \
 	${SED} ${MLPATCHPATHREGEX} | \
 	${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \
 	>> ${MLRUNTIMEPLIST}
-.endfor
 	@cd "${WRKDIR}" && ( \
 	( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \
 	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \
@@ -247,6 +265,7 @@ do-install:
 	@${ECHO} '(* Rebuilding the recompiled libs: *)'
 	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+	${ECHO_CMD} ${CMB_COMMAND} ; \
 	${ECHO_CMD} 'CMB.make ();' ) | \
 	../../bin/sml
 	@${ECHO} '(* Rebuilding the recompiled heap: *)'
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index 058c47cb6375..b5de6a66bb67 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,60 +1,60 @@
-MD5 (sml-nj/110.65/MLRISC.tgz) = 6dee2df1bb58a90d86dc545261375edf
-SHA256 (sml-nj/110.65/MLRISC.tgz) = 24c036655e35f8a527b32d874231631ba84070d33fd1432de70fb38e0e5dedf4
-SIZE (sml-nj/110.65/MLRISC.tgz) = 1367586
-MD5 (sml-nj/110.65/boot.x86-unix.tgz) = df97db3fedf27627b134da88bc240d46
-SHA256 (sml-nj/110.65/boot.x86-unix.tgz) = 7d27f46bea0f53a87b40dbe63b3f1b4b9c7a9a851de47d718a678ff7da7f88c1
-SIZE (sml-nj/110.65/boot.x86-unix.tgz) = 5856903
-MD5 (sml-nj/110.65/ckit.tgz) = 1afdc1549105e4a40259ac595b5e75ac
-SHA256 (sml-nj/110.65/ckit.tgz) = 356db254e4490fb59fc25af9fd21fd5ce4014b48801a1de6c70bcdd785243f21
-SIZE (sml-nj/110.65/ckit.tgz) = 195616
-MD5 (sml-nj/110.65/cm.tgz) = 936537d0f28bc05f2b2e228cb67a30e4
-SHA256 (sml-nj/110.65/cm.tgz) = 25e4dffe764bc7f03784d6c06b5c8dc939458f800f127ffa3ce9c20db6f66537
-SIZE (sml-nj/110.65/cm.tgz) = 200916
-MD5 (sml-nj/110.65/cml.tgz) = 7cdff48d92dc2d76dce22d1da0987884
-SHA256 (sml-nj/110.65/cml.tgz) = 767664558904ac7599a30c22263ea9938a69e6be6a2e03e23a23bf8bcb8f9d0d
-SIZE (sml-nj/110.65/cml.tgz) = 104410
-MD5 (sml-nj/110.65/compiler.tgz) = 8b3cb4bdea7b89754e943432c51e6efa
-SHA256 (sml-nj/110.65/compiler.tgz) = 46fc836648215aadff547133d5d3f3039bf2a9adfd02b6434670c781ee0d8deb
-SIZE (sml-nj/110.65/compiler.tgz) = 812703
-MD5 (sml-nj/110.65/config.tgz) = 833741f2d668e8de3529a6a4b2f7dccd
-SHA256 (sml-nj/110.65/config.tgz) = aadcb4fb1afe76528e307e0374859d8b9f872b50df427c934491a1b2f7e6f3f1
-SIZE (sml-nj/110.65/config.tgz) = 17405
-MD5 (sml-nj/110.65/eXene.tgz) = a17eb858237d8adb3732d08613501887
-SHA256 (sml-nj/110.65/eXene.tgz) = 4dca2956f2991c82d6e86fbfc9ead0b98c3e2770da9d55c2d3fed2735e2ce392
-SIZE (sml-nj/110.65/eXene.tgz) = 708192
-MD5 (sml-nj/110.65/heap2asm.tgz) = fe37e8a575d73a9163046cf77472aebf
-SHA256 (sml-nj/110.65/heap2asm.tgz) = 68a82aaaf6fa8c52fdbb9edd7a242eb9ea33eaf5cd5bff55f0cb5264bf164f64
-SIZE (sml-nj/110.65/heap2asm.tgz) = 1320
-MD5 (sml-nj/110.65/ml-burg.tgz) = 0604d5430ab3ceff4825e67d24eda908
-SHA256 (sml-nj/110.65/ml-burg.tgz) = 535c92690b230a84e13868c5c3961ff7caacc063a03c573c7d74f68ff9fd1886
-SIZE (sml-nj/110.65/ml-burg.tgz) = 35989
-MD5 (sml-nj/110.65/ml-lex.tgz) = a0add456d9cc4bcf2fd43c3078322ec7
-SHA256 (sml-nj/110.65/ml-lex.tgz) = 58cb45190a410d2d24186a2ad5982f49f1e19c2f6697faa69aa3be053d9fa750
-SIZE (sml-nj/110.65/ml-lex.tgz) = 33050
-MD5 (sml-nj/110.65/ml-lpt.tgz) = 51d9cf0badcf3bfa5b2552edd9c9b378
-SHA256 (sml-nj/110.65/ml-lpt.tgz) = b432e08a840fde1608023558eeffcaf6f5b1e33b0f5f3bdd8fae326a0bea8bff
-SIZE (sml-nj/110.65/ml-lpt.tgz) = 250096
-MD5 (sml-nj/110.65/ml-yacc.tgz) = cc9a3fc240b0b56f4b32d5bbd06b6441
-SHA256 (sml-nj/110.65/ml-yacc.tgz) = 303d5afd820b916deb967bb70e04883a5bd2b6063a724cda00d1745f3991a67c
-SIZE (sml-nj/110.65/ml-yacc.tgz) = 98502
-MD5 (sml-nj/110.65/nlffi.tgz) = d877cf85fdd5a1d952ba9e856cfdddfc
-SHA256 (sml-nj/110.65/nlffi.tgz) = fdbae1fbc661de417dcde7e8f56d74f262ffb70a62b341b787e84558b3a2a035
-SIZE (sml-nj/110.65/nlffi.tgz) = 73030
-MD5 (sml-nj/110.65/pgraph.tgz) = d8160b52274f113373293ebf8fa158d1
-SHA256 (sml-nj/110.65/pgraph.tgz) = 3983bd803d939f6b4cb0f96d82c046a71f864c39ccbe73a9a9eefd5054cdda81
-SIZE (sml-nj/110.65/pgraph.tgz) = 5446
-MD5 (sml-nj/110.65/runtime.tgz) = e637fe9584529a2179c54b0f325b2da1
-SHA256 (sml-nj/110.65/runtime.tgz) = e1f83be6dd11bbd6082d9d1846d9cb012c2ab7314c79bf16b86a309458b5be8c
-SIZE (sml-nj/110.65/runtime.tgz) = 315775
-MD5 (sml-nj/110.65/smlnj-c.tgz) = 84528473fb02c8575197a25198407df0
-SHA256 (sml-nj/110.65/smlnj-c.tgz) = 87e83d2425f8dbd27a2c7c863b5025e94bae6e57058f096236e6987aa1c2580a
-SIZE (sml-nj/110.65/smlnj-c.tgz) = 10540
-MD5 (sml-nj/110.65/smlnj-lib.tgz) = b43f56983759d38a4110acb863dee00e
-SHA256 (sml-nj/110.65/smlnj-lib.tgz) = 5d094350160cdee7773d1ac502e57bd3be782f35022354d1b940d8f16a7d6a1a
-SIZE (sml-nj/110.65/smlnj-lib.tgz) = 230758
-MD5 (sml-nj/110.65/system.tgz) = 2875b7e8d3349ff03e7dc682bd42e9cd
-SHA256 (sml-nj/110.65/system.tgz) = 95608f9718821af84b68ae210d33b7a76465a9182d4463c193abcc2a66dad8f6
-SIZE (sml-nj/110.65/system.tgz) = 223918
-MD5 (sml-nj/110.65/trace-debug-profile.tgz) = db14311ae135692024bbc30ef55d222f
-SHA256 (sml-nj/110.65/trace-debug-profile.tgz) = e347119d27d6fecad72e0cd1b355db79305a40b36edac66573b794f71a9944fa
-SIZE (sml-nj/110.65/trace-debug-profile.tgz) = 3904
+MD5 (sml-nj/110.71/MLRISC.tgz) = a38d4c283ed619295278cda6db054e07
+SHA256 (sml-nj/110.71/MLRISC.tgz) = fe86100738b12fb7edbbddf66626b96d4d13c149dd71e0cfb8132a92a7522ae1
+SIZE (sml-nj/110.71/MLRISC.tgz) = 1435231
+MD5 (sml-nj/110.71/boot.x86-unix.tgz) = 753c50345fcd3b97aecd5c4743388de4
+SHA256 (sml-nj/110.71/boot.x86-unix.tgz) = 2f1a41e6639963a5c09b453d941c4ac7c62d5043e2cc2b25d2a18feb7517bc04
+SIZE (sml-nj/110.71/boot.x86-unix.tgz) = 5849700
+MD5 (sml-nj/110.71/ckit.tgz) = de846fecaade7454db0f3a7aabbf3651
+SHA256 (sml-nj/110.71/ckit.tgz) = fc8320898b17106bf759bc813c69aecfe1732d0c13e9b54ed5522920bbd562a7
+SIZE (sml-nj/110.71/ckit.tgz) = 199404
+MD5 (sml-nj/110.71/cm.tgz) = ba5b37522aff8726935203582fc5cca8
+SHA256 (sml-nj/110.71/cm.tgz) = 40bb024769f28a70b45e4ad87bb781c1277c4fa0de7ae1b5109263ed073c0300
+SIZE (sml-nj/110.71/cm.tgz) = 202311
+MD5 (sml-nj/110.71/cml.tgz) = 559fc31cae3f8b0808f991029ee04199
+SHA256 (sml-nj/110.71/cml.tgz) = 469f013db2e6abae40db34f4e78c0ce556a730c6b9a567eea35df7aa2f6b1f96
+SIZE (sml-nj/110.71/cml.tgz) = 104707
+MD5 (sml-nj/110.71/compiler.tgz) = 2cb77c40207fa7490f8d9d5e0daa7e5a
+SHA256 (sml-nj/110.71/compiler.tgz) = 3040cc3fed1f2b00f33d290bd52e999a8ea73d2ba847bbe5b16165276c07afaf
+SIZE (sml-nj/110.71/compiler.tgz) = 825457
+MD5 (sml-nj/110.71/config.tgz) = 33334c69b5f3eff1f4f65377551a89e5
+SHA256 (sml-nj/110.71/config.tgz) = accafba082cb3b7e2bbfff3221bbe49dcfb8029a5d6f8002f98597890870a3be
+SIZE (sml-nj/110.71/config.tgz) = 512911
+MD5 (sml-nj/110.71/eXene.tgz) = 2e24fac128d1e29250c94425a6613f2b
+SHA256 (sml-nj/110.71/eXene.tgz) = 23b12302c8fdeb4c94918cf1c24739c72f01114597b3bfef817c58943ec2c467
+SIZE (sml-nj/110.71/eXene.tgz) = 714564
+MD5 (sml-nj/110.71/heap2asm.tgz) = edee3a9c1d565b399b9bbe6a21254855
+SHA256 (sml-nj/110.71/heap2asm.tgz) = 01cae1f1d5217405e367d0efd1385161602d3f0828f54e794190baa13d733d0f
+SIZE (sml-nj/110.71/heap2asm.tgz) = 1326
+MD5 (sml-nj/110.71/ml-burg.tgz) = 9e968edfa8f03155401c304c004445b4
+SHA256 (sml-nj/110.71/ml-burg.tgz) = 429f2e974db4131c74eea141902491af9df1d55bc2c0767356434bab13b90dd5
+SIZE (sml-nj/110.71/ml-burg.tgz) = 36670
+MD5 (sml-nj/110.71/ml-lex.tgz) = 004919c1e1658299bce52e17e7efa260
+SHA256 (sml-nj/110.71/ml-lex.tgz) = 0a951e91caa43e025eeaa03879764e93519e82ace817eaf86d5c0f469360322b
+SIZE (sml-nj/110.71/ml-lex.tgz) = 33060
+MD5 (sml-nj/110.71/ml-lpt.tgz) = ec612fde778f7ee0742321b7f414b160
+SHA256 (sml-nj/110.71/ml-lpt.tgz) = e5c3489a9d60d4d45a266240e380a497b05f8f45ba44da83a704c4388cf664d1
+SIZE (sml-nj/110.71/ml-lpt.tgz) = 254684
+MD5 (sml-nj/110.71/ml-yacc.tgz) = f49b7a70f126d25aaf32a09e68185799
+SHA256 (sml-nj/110.71/ml-yacc.tgz) = 3e5b9ec0af3704c7045a43d974902abddecefd8d25a41225b06b7390dcf29453
+SIZE (sml-nj/110.71/ml-yacc.tgz) = 102023
+MD5 (sml-nj/110.71/nlffi.tgz) = 92e156c6623b92040c1011c7384ebf3b
+SHA256 (sml-nj/110.71/nlffi.tgz) = dc23c4ea4101f918fe5f92622c9b34b88cb91c62c2c41911e7117a7aa389f44a
+SIZE (sml-nj/110.71/nlffi.tgz) = 75182
+MD5 (sml-nj/110.71/pgraph.tgz) = bb4a20cdca80e3be06b016d1b2ecd3a2
+SHA256 (sml-nj/110.71/pgraph.tgz) = e9514a3c8c002627bf2297bca020028d6d27a6a3c31f940db1dcf2dc3941885b
+SIZE (sml-nj/110.71/pgraph.tgz) = 5454
+MD5 (sml-nj/110.71/runtime.tgz) = 5b017473a817163587fb36e4c3921259
+SHA256 (sml-nj/110.71/runtime.tgz) = ec6d38c782876db979a7b03444ded0bfaa0154d8e88c0a7befa6836f9b235763
+SIZE (sml-nj/110.71/runtime.tgz) = 334109
+MD5 (sml-nj/110.71/smlnj-c.tgz) = afaa63b6871387ad4d78bd831d132748
+SHA256 (sml-nj/110.71/smlnj-c.tgz) = 1ae91e81e77b422367f34fa1bedced1235ba0da5363b075e62bc0d39a55e8fde
+SIZE (sml-nj/110.71/smlnj-c.tgz) = 10625
+MD5 (sml-nj/110.71/smlnj-lib.tgz) = 49631e6a648afedb9e29454c4052704a
+SHA256 (sml-nj/110.71/smlnj-lib.tgz) = 3dd4cbe21bd9d2917d22d8b793776e6c519f175ddb96f6339f890f69d54feda9
+SIZE (sml-nj/110.71/smlnj-lib.tgz) = 259309
+MD5 (sml-nj/110.71/system.tgz) = 22574eb475fbb3a7d8c345ad1e9dbe04
+SHA256 (sml-nj/110.71/system.tgz) = 6279962f447ce17df64a3c52e8c10f98f0e09b41d5418077d5880a9445eb3ad3
+SIZE (sml-nj/110.71/system.tgz) = 239973
+MD5 (sml-nj/110.71/trace-debug-profile.tgz) = 0ae3fc7bd1523080a809128cc37d8c6f
+SHA256 (sml-nj/110.71/trace-debug-profile.tgz) = 3b4db9f3546c02ce5c4510e070ee304b768914914e47acdbae3a82397df1ac28
+SIZE (sml-nj/110.71/trace-debug-profile.tgz) = 3935
diff --git a/lang/sml-nj-devel/files/patch-config_allsources b/lang/sml-nj-devel/files/patch-config_allsources
deleted file mode 100644
index ab7b09bbdb3a..000000000000
--- a/lang/sml-nj-devel/files/patch-config_allsources
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/allsources.orig	Fri Nov 10 21:26:00 2006
-+++ config/allsources	Sun Jun 17 01:22:22 2007
-@@ -10,7 +10,6 @@
- system
- ml-yacc
- ml-lex
--lexgen
- ml-burg
- ml-nlffigen
- ml-nlffi-lib
diff --git a/lang/sml-nj-devel/files/patch-config_install.sh b/lang/sml-nj-devel/files/patch-config_install.sh
index ebd1fbc1b671..b73747a51a73 100644
--- a/lang/sml-nj-devel/files/patch-config_install.sh
+++ b/lang/sml-nj-devel/files/patch-config_install.sh
@@ -1,5 +1,5 @@
---- config/install.sh.orig	Thu Nov  2 22:23:22 2006
-+++ config/install.sh	Sun Nov 19 23:51:03 2006
+--- config/install.sh.orig	Tue May 22 18:48:30 2007
++++ config/install.sh	Sun Sep 16 02:56:22 2007
 @@ -18,6 +18,8 @@
      nolib=false
  fi
@@ -38,7 +38,7 @@
  this=$0
  
  
-@@ -307,7 +331,12 @@
+@@ -308,7 +332,12 @@
  # the name of the bin files directory
  #
  BOOT_ARCHIVE=boot.$ARCH-unix
@@ -52,7 +52,7 @@
  
  #
  # build the run-time system
-@@ -316,6 +345,11 @@
+@@ -317,6 +346,11 @@
      vsay $this: Run-time system already exists.
  else
      "$CONFIGDIR"/unpack "$ROOT" runtime
@@ -64,7 +64,7 @@
      cd "$BASEDIR"/runtime/objs
      echo $this: Compiling the run-time system.
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-@@ -330,7 +364,7 @@
+@@ -331,7 +365,7 @@
  	if [ -f run.$ARCH-$OPSYS.a ]; then
  	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
  	fi
@@ -73,7 +73,7 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -356,7 +390,7 @@
+@@ -357,7 +391,7 @@
  	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
      fi
  else
@@ -82,12 +82,31 @@
  
      fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
  
-@@ -427,5 +461,12 @@
+@@ -415,6 +449,18 @@
+ 
+ cd "$ROOT"
+ 
++# apply source patches for standard targets
++[ -n "$MLSTANDARDPATCHDIRS" ] && \
++for d in $MLSTANDARDPATCHDIRS
++do
++	"$CONFIGDIR"/unpack "$ROOT" "$d"
++done
++[ -n "$MLSTANDARDPATCHES" ] && \
++for p in $MLSTANDARDPATCHES
++do
++	do_patch $p
++done
++
+ #
+ # Now do all the rest using the precompiled installer:
+ #
+@@ -430,5 +476,12 @@
  	complain "$this: !!! Installation of libraries and programs failed."
      fi
  fi
 +
-+# apply source patches
++# apply all source patches
 +[ -n "$MLSOURCEPATCHES" ] && \
 +for p in $MLSOURCEPATCHES
 +do
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index f8d9e9a551f9..d99768293640 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -28,6 +28,11 @@ smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-sparc.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86-64.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
@@ -39,8 +44,8 @@ smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/MLTREE.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/PPC.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Peephole.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/RA.cm
-smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/StagedAlloc.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Visual.cm
 smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm
@@ -52,6 +57,7 @@ smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix/dir-tool.cm
 smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm
 smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm
 smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm
+smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix/json-lib.cm
 smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix/lex-ext.cm
 smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix/make-tool.cm
 smlnj/lib/ml-antlr-tool.cm/.cm/%%MLARCH%%-unix/ml-antlr-tool.cm
@@ -180,6 +186,9 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/inet-lib.cm/.cm
 @dirrm smlnj/lib/inet-lib.cm
+@dirrm smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/json-lib.cm/.cm
+@dirrm smlnj/lib/json-lib.cm
 @dirrm smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/lex-ext.cm/.cm
 @dirrm smlnj/lib/lex-ext.cm