7 files changed, 136 insertions, 116 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 46c1de70a74e..44e8085295ed 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.59
+PORTVERSION=	110.60
 CATEGORIES=	lang
 MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
 		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
@@ -37,8 +37,8 @@ DISTFILES+=	boot.x86-unix.tgz
 #MLARCH=		alpha32
 #DISTFILES+=	boot.alpha32-unix.tgz
 .endif
-DISTFILES+=	ml-yacc.tgz ml-lex.tgz lexgen.tgz smlnj-lib.tgz cml.tgz \
-		MLRISC.tgz ckit.tgz heap2asm.tgz
+DISTFILES+=	MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz lexgen.tgz \
+		ml-lex.tgz ml-yacc.tgz smlnj-lib.tgz
 
 PLIST_SUB=	MLARCH=${MLARCH}
 
@@ -47,22 +47,27 @@ WITH_EVERYTHING?=	${WITH_RECOMPILE}
 .endif
 
 .if defined(WITH_EVERYTHING)
-DISTFILES+=	ml-burg.tgz ml-nlffi-lib.tgz ml-nlffigen.tgz smlnj-c.tgz \
-		eXene.tgz cm.tgz compiler.tgz system.tgz tools.tgz
+DISTFILES+=	cm.tgz compiler.tgz eXene.tgz ml-burg.tgz ml-lpt.tgz \
+		nlffi.tgz pgraph.tgz smlnj-c.tgz system.tgz \
+		trace-debug-profile.tgz
 .endif
 
 MLROOTRELATIVE=	smlnj
 MLROOT=		${PREFIX}/${MLROOTRELATIVE}
 MLBIN=		${MLROOT}/bin
 MLLIB=		${MLROOT}/lib
-MLSRCSBASE=	ckit src
-MLSRCS=		${MLROOT}/ckit ${MLROOT}/src
+MLSRCDIRS=	base ckit cml eXene heap2asm lexgen ml-burg ml-lex ml-lpt \
+		ml-yacc nlffi pgraph smlnj-c smlnj-lib
+MLSRCS=
+.for srcdir in ${MLSRCDIRS}
+MLSRCS+=	${MLROOT}/${srcdir}
+.endfor
 MLTARGETS=	heap2asm
-MLEXE=		sml ml-yacc lexgen ml-lex ml-build ml-makedepend heap2exec
+MLEXE=		heap2exec lexgen ml-build ml-lex ml-makedepend ml-yacc sml
 .if defined(WITH_EVERYTHING)
-MLTARGETS+=	ml-burg eXene src-smlnj \
-		ml-nlffi-lib ml-nlffigen nowhere pgraph-util
-MLEXE+=		ml-burg ml-nlffigen nowhere
+MLTARGETS+=	eXene ml-antlr ml-burg ml-nlffi-lib ml-nlffigen ml-ulex \
+		mlrisc-tools nowhere pgraph-util tdp-util src-smlnj
+MLEXE+=		ml-antlr ml-burg ml-nlffigen ml-ulex nowhere
 PLIST=		${WRKDIR}/.PLIST
 MLRUNTIMEPLIST=	${WRKDIR}/.PLIST-runtime
 MLSRCPLIST=	${WRKDIR}/.PLIST-src
@@ -73,11 +78,14 @@ MLPLISTFILES=	${.CURDIR}/pkg-plist ${FILESDIR}/plist-everything \
 pre-fetch:
 	@${ECHO}
 .if !defined(WITH_EVERYTHING)
-	@${ECHO} 'Use make WITH_EVERYTHING=yes to also build ml-burg'
-	@${ECHO} ' (tree transformer), eXene (X Windows toolkit),'
+	@${ECHO} 'Use make WITH_EVERYTHING=yes to also build/install'
+	@${ECHO} ' eXene (X Windows toolkit),'
+	@${ECHO} ' ml-antlr (LL(k) parser generator),'
+	@${ECHO} ' ml-burg (tree transformer),'
 	@${ECHO} ' ml-nlffi (foreign function interface to C code),'
+	@${ECHO} ' ml-ulex (lexer generator with unicode support),'
 	@${ECHO} ' nowhere (preprocessor for conditional patterns),'
-	@${ECHO} ' and all the sources.'
+	@${ECHO} ' various libraries, and all the sources.'
 .endif
 .if !defined(WITH_RECOMPILE)
 	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
@@ -92,7 +100,8 @@ post-extract:
 
 # Configuring is done by uncommenting the appropriate #request xxx
 # lines of config/targets. Dependency details are handled by
-# src/system/smlnj/installer using config/dependencies.
+# base/system/smlnj/installer using config/dependencies and
+# config/actions.
 
 do-configure:
 .if defined(MLTARGETS)
@@ -113,12 +122,12 @@ do-configure:
 .endif
 
 # The build target patches, builds, and installs the system within WRKDIR.
-# src/runtime is not cleaned afterwards to avoid its recompilation during
+# base/runtime is not cleaned afterwards to avoid its recompilation during
 # a subsequent make install.
-# See src/system/README for information on recompiling the compiler.
+# See base/system/README for information on recompiling the compiler.
 
 .if defined(WITH_RECOMPILE)
-RECOMPILEDIR=	src/system
+RECOMPILEDIR=	base/system
 .else
 RECOMPILEDIR=
 .endif
@@ -130,11 +139,11 @@ AUXDEVNULL!=	if [ -w ${AUXDEV}/null ]; then ${ECHO_CMD} -n ${AUXDEV}/null; \
 		else ${ECHO_CMD} -n '${WRKDIR}/.devnull'; fi
 
 MLRUNTIMEPATCHES!=	cd ${FILESDIR} && \
-			( ${LS} do-patch-src_runtime_* 2> ${AUXDEVNULL} || \
+			( ${LS} do-patch-base_runtime_* 2> ${AUXDEVNULL} || \
 			  ${TRUE} )
 .if defined(WITH_EVERYTHING)
 MLSOURCEPATCHES!=	cd ${FILESDIR} && \
-			( ${LS} do-patch-src_* 2> ${AUXDEVNULL} || \
+			( ${LS} do-patch-* 2> ${AUXDEVNULL} || \
 			  ${TRUE} )
 .else
 MLSOURCEPATCHES=
@@ -147,7 +156,7 @@ do-build:
 	MLRUNTIMEPATCHES="${MLRUNTIMEPATCHES}" \
 	MLSOURCEPATCHES="${MLSOURCEPATCHES}"	./config/install.sh
 .if defined(WITH_RECOMPILE)
-	${RM} ${WRKDIR}/config/targets.customized
+	-${RM} ${WRKDIR}/config/targets.customized
 	@${ECHO} '(* Recompiling the core system: *)'
 	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
@@ -180,7 +189,7 @@ MLNOINSTALL=	.cm
 MLNOINSTALL+=	sml.bin.${MLARCH}-unix sml.boot.${MLARCH}-unix \
 		sml.lib sml.${MLARCH}-bsd
 .endif
-MLSRCEXCLUDEREGEX=	-e '^(@dirrm\ )?${MLROOTRELATIVE}/src/runtime'
+MLSRCEXCLUDEREGEX=	-e '^(@dirrm\ )?${MLROOTRELATIVE}/base/runtime'
 .for excl in ${MLNOINSTALL}
 MLSRCEXCLUDEREGEX+=	-e '/${excl}$$' -e '/${excl}/'
 .endfor
@@ -191,23 +200,26 @@ MLPATCHPATHREGEX=	-E -e 's%(^|[^_])_([^_]|$$)%\1/\2%g' \
 pre-install:
 	@${ECHO} -n '(* Computing package list ...'
 	@${TAR} -tzf ${WRKDIR}/runtime.tgz | \
-	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/src/\1%' \
-		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/src/\1%' \
+	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
+		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
 		> ${MLRUNTIMEPLIST}
 .for p in ${MLRUNTIMEPATCHES}
 	@${ECHO_CMD} '${p}' | \
 	${SED} ${MLPATCHPATHREGEX} | \
-	${SED} -E -e 's%^do-patch-(src/.*)%${MLROOTRELATIVE}/\1.orig%' \
+	${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \
 	>> ${MLRUNTIMEPLIST}
 .endfor
 	@cd "${WRKDIR}" && ( \
-	( ${FIND} -s -d ${MLSRCSBASE} \! -type d | \
+	( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \
 	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \
-	( ${FIND} -s -d ${MLSRCSBASE} -type d | \
+	( ${FIND} -s -d ${MLSRCDIRS} -type d -empty | \
+	${AWK} '{ print "@exec mk""dir -p %D/${MLROOTRELATIVE}/" $$0 }' ) ; \
+	( ${FIND} -s -d ${MLSRCDIRS} -type d | \
 	${AWK} '{ print "@dirrm ${MLROOTRELATIVE}/" $$0 }' ) ) | \
 	${EGREP} -v ${MLSRCEXCLUDEREGEX} > ${MLSRCPLIST}
-	@${GREP} -h ^[^@] ${MLPLISTFILES} | ${SORT} -u > ${PLIST}
-	@${GREP} -h ^@dirrm ${MLPLISTFILES} | ${SORT} -r -u >> ${PLIST}
+	@${GREP} -h "^[^@]" ${MLPLISTFILES} | ${SORT} -u > ${PLIST}
+	@${GREP} -h "^@exec mk""dir" ${MLPLISTFILES} | ${SORT} -u >> ${PLIST}
+	@${GREP} -h "^@dirrm" ${MLPLISTFILES} | ${SORT} -r -u >> ${PLIST}
 	@${ECHO} ' done. *)'
 .endif
 
@@ -249,10 +261,10 @@ do-install:
 	${STRIP_CMD} "${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )
 	@${CHOWN} -R ${BINOWN}:${BINGRP} "${MLBIN}" "${MLLIB}"
 .if defined(WITH_EVERYTHING)
-	@${ECHO} '(* Cleaning src/runtime: *)'
-	cd ${WRKDIR}/src/runtime/objs && ${GMAKE} clean
+	@${ECHO} '(* Cleaning base/runtime: *)'
+	cd ${WRKDIR}/base/runtime/objs && ${GMAKE} clean
 	@${ECHO} -n '(* Installing sources into ${MLROOT} ...'
-	@cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCSBASE} | \
+	@cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \
 	${TAR} -xf - -C "${MLROOT}"
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${MLSRCS}
 	@${ECHO} ' done. *)'
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index 0db0271a71d3..43d4fc615ba7 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,60 +1,63 @@
-MD5 (sml-nj/110.59/MLRISC.tgz) = 9a3df76e0dfa8048867c12babbe00c5a
-SHA256 (sml-nj/110.59/MLRISC.tgz) = 8d41a136d985b558662237fded521cc0b71fc97890f8331502cfe173a9e7471e
-SIZE (sml-nj/110.59/MLRISC.tgz) = 1227156
-MD5 (sml-nj/110.59/boot.x86-unix.tgz) = 64845eb1c7dc234692dac699e4840c56
-SHA256 (sml-nj/110.59/boot.x86-unix.tgz) = 99aabcf6db6d1a3741faad67d32ec9b564ab9041ff3106ca443c4b186bb4bb1c
-SIZE (sml-nj/110.59/boot.x86-unix.tgz) = 5490738
-MD5 (sml-nj/110.59/ckit.tgz) = 441d58363f776001bc0fbf27b5bdf334
-SHA256 (sml-nj/110.59/ckit.tgz) = fe1a5366e1a08e57050c775541ae61eb07589082811eead65523f8156faf2ec9
-SIZE (sml-nj/110.59/ckit.tgz) = 168162
-MD5 (sml-nj/110.59/cm.tgz) = c2bf097819d8979d0362c5d9bd68ce20
-SHA256 (sml-nj/110.59/cm.tgz) = ca36f7c748a6b4dcea5e67292cb5c2dc146b69442ce196b0ad4845c10b09992a
-SIZE (sml-nj/110.59/cm.tgz) = 206267
-MD5 (sml-nj/110.59/cml.tgz) = ddb1f52ada206126367b7d9c4b666c41
-SHA256 (sml-nj/110.59/cml.tgz) = 03e1e1bee5146cf2194b74a92e257260027d8abfc1619a556d9892b4e568d39e
-SIZE (sml-nj/110.59/cml.tgz) = 104357
-MD5 (sml-nj/110.59/compiler.tgz) = 236cd470dc6d01c57ccac74fd39e3900
-SHA256 (sml-nj/110.59/compiler.tgz) = 94bf74de9cbbfc2c575b89fdf37b8e933d41a7fa5cbf480b10ccc6fb58bde066
-SIZE (sml-nj/110.59/compiler.tgz) = 737756
-MD5 (sml-nj/110.59/config.tgz) = be71ac7054667e17a0e3376bcc07f847
-SHA256 (sml-nj/110.59/config.tgz) = cf6b1c377eb4df73d61adcd469ad6e828b61fd01992e173fc13f3643789802a6
-SIZE (sml-nj/110.59/config.tgz) = 15213
-MD5 (sml-nj/110.59/eXene.tgz) = 919f878c43b02edc581c1a0542db6322
-SHA256 (sml-nj/110.59/eXene.tgz) = 03e4eef280a2f5518637f3611a5f3a98fadba18aaebf4a0fe053985a7c53b29c
-SIZE (sml-nj/110.59/eXene.tgz) = 708186
-MD5 (sml-nj/110.59/heap2asm.tgz) = 394931085f4e1975f771cfcedb9334ff
-SHA256 (sml-nj/110.59/heap2asm.tgz) = bb7fce6cc1dcc6d19676df78f92289074f28c03c29ed30e66b2bb962f0befc92
-SIZE (sml-nj/110.59/heap2asm.tgz) = 1311
-MD5 (sml-nj/110.59/lexgen.tgz) = 9be393e787950fffaaf123682b47a3f3
-SHA256 (sml-nj/110.59/lexgen.tgz) = b4dfc703c2d51b411c9bd636f231e8ca913e1c667c4e169d0df8c0c418fde12a
-SIZE (sml-nj/110.59/lexgen.tgz) = 57569
-MD5 (sml-nj/110.59/ml-burg.tgz) = c5fad291f6ee29d14ecd22ad8f3de029
-SHA256 (sml-nj/110.59/ml-burg.tgz) = f9e8f9e018b49c1d92cba513f387701b9f49a2973401ed1795125c8ba49bddce
-SIZE (sml-nj/110.59/ml-burg.tgz) = 31552
-MD5 (sml-nj/110.59/ml-lex.tgz) = ab9df0b18949282200d874c50a655540
-SHA256 (sml-nj/110.59/ml-lex.tgz) = 4d3128e9b4fcb54f26061e0077af3b648bf433fc6469373aed3ff8e1abee31f0
-SIZE (sml-nj/110.59/ml-lex.tgz) = 32408
-MD5 (sml-nj/110.59/ml-nlffi-lib.tgz) = 8d02ca80da7547930c98734d74155261
-SHA256 (sml-nj/110.59/ml-nlffi-lib.tgz) = c3d85b932f08e36d7b2335c579a6df3956c403cd381e54db0732bac48b83dc30
-SIZE (sml-nj/110.59/ml-nlffi-lib.tgz) = 44216
-MD5 (sml-nj/110.59/ml-nlffigen.tgz) = e8b2c9375897c003996db5314584ece1
-SHA256 (sml-nj/110.59/ml-nlffigen.tgz) = 5a9307a7d5db173ddceaff57a14bb782c2733521cc436cd269abe270d1871217
-SIZE (sml-nj/110.59/ml-nlffigen.tgz) = 29496
-MD5 (sml-nj/110.59/ml-yacc.tgz) = 4b0660904def5e719cc4b8beb4ec3c89
-SHA256 (sml-nj/110.59/ml-yacc.tgz) = 6f8b619849c4934f698a2cf8295c9669994177b85bc532858738a5515923e0f7
-SIZE (sml-nj/110.59/ml-yacc.tgz) = 95230
-MD5 (sml-nj/110.59/runtime.tgz) = c7708cf9e4e52b075da026cc9abe1d35
-SHA256 (sml-nj/110.59/runtime.tgz) = 8babcef45fc631fc02ecac3b17da73ae4363e5adef1345be9379d5e793893d53
-SIZE (sml-nj/110.59/runtime.tgz) = 314457
-MD5 (sml-nj/110.59/smlnj-c.tgz) = eb80ae9aa86af377e99125859d7284cd
-SHA256 (sml-nj/110.59/smlnj-c.tgz) = 4970fce217393efa7ee486c27d1144df0b29fec357892f3a71d7c9c7bfb5cc68
-SIZE (sml-nj/110.59/smlnj-c.tgz) = 10535
-MD5 (sml-nj/110.59/smlnj-lib.tgz) = 00657168132e000db7b47866b1db3322
-SHA256 (sml-nj/110.59/smlnj-lib.tgz) = 55b0833a962acdcc0172bd002185f074e558bf496e89a584d2becc98329edc88
-SIZE (sml-nj/110.59/smlnj-lib.tgz) = 226975
-MD5 (sml-nj/110.59/system.tgz) = 47caa72a48daaaae88fc7fd585747e69
-SHA256 (sml-nj/110.59/system.tgz) = b09afa939a8f2e96d5cb716559fdc7b4953c86335243a8a35341dcb79172d0ff
-SIZE (sml-nj/110.59/system.tgz) = 220608
-MD5 (sml-nj/110.59/tools.tgz) = 80f4a7da13ba713615142609283b3ef7
-SHA256 (sml-nj/110.59/tools.tgz) = 7937fae4903e91551a6710cc41f63cbcaf6ed4f51048a9d9f24c2a398646766c
-SIZE (sml-nj/110.59/tools.tgz) = 3919
+MD5 (sml-nj/110.60/MLRISC.tgz) = 9be399972ee2355580290fb88365397d
+SHA256 (sml-nj/110.60/MLRISC.tgz) = 48d5d29bb734d08bc7f0aa64ba90462a6fb1d4a62ab83ea2dfb9ec697f03a739
+SIZE (sml-nj/110.60/MLRISC.tgz) = 1335303
+MD5 (sml-nj/110.60/boot.x86-unix.tgz) = d40ac430520232b8fff3aae443b67c57
+SHA256 (sml-nj/110.60/boot.x86-unix.tgz) = f054e6d895133be784d1f10fc4b807ac5b04e19f3d469ce0ed544a9970126ee7
+SIZE (sml-nj/110.60/boot.x86-unix.tgz) = 5801916
+MD5 (sml-nj/110.60/ckit.tgz) = 783ededc63d468ebbe4897c2b4428821
+SHA256 (sml-nj/110.60/ckit.tgz) = ad0d96e29361cc8723bcd58ed631d940185a37bab76e402ed2b383d1cd126946
+SIZE (sml-nj/110.60/ckit.tgz) = 168140
+MD5 (sml-nj/110.60/cm.tgz) = 902c99ecaf339fd8e3225beb24e2cc39
+SHA256 (sml-nj/110.60/cm.tgz) = 2c4bc31203666df07d6093426a61d52907753f3d94a1522e57990df8f051db4c
+SIZE (sml-nj/110.60/cm.tgz) = 201282
+MD5 (sml-nj/110.60/cml.tgz) = f5f64c1abb02dd25805ca45d6ff85cf2
+SHA256 (sml-nj/110.60/cml.tgz) = d47374990b0dba142be57b9f38b015391e880e3f44e434b66205b75d1a553615
+SIZE (sml-nj/110.60/cml.tgz) = 104352
+MD5 (sml-nj/110.60/compiler.tgz) = 9f737cf77edcf1b23016fe09f39905c6
+SHA256 (sml-nj/110.60/compiler.tgz) = 9a915208eb2bc45fba79633d0d7f2a2918230389bb2d0b84e5684e0c3cd62d83
+SIZE (sml-nj/110.60/compiler.tgz) = 743513
+MD5 (sml-nj/110.60/config.tgz) = 5b8dba5a75076255e23b2d83bd10dc3d
+SHA256 (sml-nj/110.60/config.tgz) = 3efd70427ee489c1cec6b27fa69b2f577e0fdc4a50ee708b809b04dcd071d998
+SIZE (sml-nj/110.60/config.tgz) = 16334
+MD5 (sml-nj/110.60/eXene.tgz) = 2b4663c601b9e5bfe519fc2ec422cb92
+SHA256 (sml-nj/110.60/eXene.tgz) = a87afc7dab44abb1a2dfb7ca08c800c2c3b64693f9bc3059e9133159dd9e74d9
+SIZE (sml-nj/110.60/eXene.tgz) = 708164
+MD5 (sml-nj/110.60/heap2asm.tgz) = 4bc249955bf820a7109ed6da055f2538
+SHA256 (sml-nj/110.60/heap2asm.tgz) = a8f93c8d8451e437c5f4e103d1f680f1dc340e363b074518abca1496875f7f91
+SIZE (sml-nj/110.60/heap2asm.tgz) = 1317
+MD5 (sml-nj/110.60/lexgen.tgz) = 8bb74c47482f6be0490f23ad1d7791fa
+SHA256 (sml-nj/110.60/lexgen.tgz) = 065f3d0e77b509dc61ab45260d0f2a6689d303d41860317ac0200b5c2ab42dae
+SIZE (sml-nj/110.60/lexgen.tgz) = 57579
+MD5 (sml-nj/110.60/ml-burg.tgz) = 00b8d4a0f3c4270458294310783af948
+SHA256 (sml-nj/110.60/ml-burg.tgz) = e2af909146e5d338943e3e03dae26b9d41b17b52043213823a9d845dbf7cc01b
+SIZE (sml-nj/110.60/ml-burg.tgz) = 31529
+MD5 (sml-nj/110.60/ml-lex.tgz) = c0e376b8ed208250d91980168bc7eb75
+SHA256 (sml-nj/110.60/ml-lex.tgz) = dca7276007d4b040a285f8fe8453963d705f4fd0ad73d722240caed2ea187cc4
+SIZE (sml-nj/110.60/ml-lex.tgz) = 32412
+MD5 (sml-nj/110.60/ml-lpt.tgz) = 9ef96b6b4fe6236d36f5660d5e79fc55
+SHA256 (sml-nj/110.60/ml-lpt.tgz) = 649dce6595ce7fa2bd1446b36e5de93a069539c191e76950b105009ef04eb07f
+SIZE (sml-nj/110.60/ml-lpt.tgz) = 202405
+MD5 (sml-nj/110.60/ml-yacc.tgz) = 0e00059ff3d320043cceabeec50757c6
+SHA256 (sml-nj/110.60/ml-yacc.tgz) = f662a478d943bb25d0bf5aeb5bf687996395a1dba51d1d56aeef5632e79553b1
+SIZE (sml-nj/110.60/ml-yacc.tgz) = 95225
+MD5 (sml-nj/110.60/nlffi.tgz) = 371ca5e7ac35011cf22c04496b0f7c11
+SHA256 (sml-nj/110.60/nlffi.tgz) = 812a70c6fd2f9a4913d422ed2e7023399b0c6a74dc8a295d0cb931cc80b44ff8
+SIZE (sml-nj/110.60/nlffi.tgz) = 73026
+MD5 (sml-nj/110.60/pgraph.tgz) = 34200a84f4bfb6bae937f966cf6ffc36
+SHA256 (sml-nj/110.60/pgraph.tgz) = 5128faa6d4f109e3e10472ae0ae73df7f6e85cbab5d40400682582eb7a5f9773
+SIZE (sml-nj/110.60/pgraph.tgz) = 5446
+MD5 (sml-nj/110.60/runtime.tgz) = d9f25556b925b3c9552daa184bfab0ba
+SHA256 (sml-nj/110.60/runtime.tgz) = 0578012df9aedca2ded986fb90c42c8099f3ce716e3bff0b8c140799ebef9f87
+SIZE (sml-nj/110.60/runtime.tgz) = 315388
+MD5 (sml-nj/110.60/smlnj-c.tgz) = 9bee206ea3c0ffc1424fb31146a23e67
+SHA256 (sml-nj/110.60/smlnj-c.tgz) = 75e45f784740aa8136724a8ee5b93eb80b9b741fbe9367922183715317494cdc
+SIZE (sml-nj/110.60/smlnj-c.tgz) = 10539
+MD5 (sml-nj/110.60/smlnj-lib.tgz) = 9626d5b10dfef0528b70aba98d4b811d
+SHA256 (sml-nj/110.60/smlnj-lib.tgz) = 91836a40575d2b5d686ad6ef680ce481887cdeddacb4d368f2f5d57ab2996113
+SIZE (sml-nj/110.60/smlnj-lib.tgz) = 227091
+MD5 (sml-nj/110.60/system.tgz) = 4a23c7fa4993e52d0dc977cca1efa140
+SHA256 (sml-nj/110.60/system.tgz) = b6a02291e6fa3cc7ce79463f0de98d93fe5ff4edd210189c051afe9755c59424
+SIZE (sml-nj/110.60/system.tgz) = 220881
+MD5 (sml-nj/110.60/trace-debug-profile.tgz) = 3ce0f63ad88e2e8ceddb035675960e2f
+SHA256 (sml-nj/110.60/trace-debug-profile.tgz) = 31dd3b5ea0b99ad61af38f4f60cb488a5f9d059dd2c8dece28cc1445b94ba31b
+SIZE (sml-nj/110.60/trace-debug-profile.tgz) = 3904
diff --git a/lang/sml-nj-devel/files/do-patch-src_runtime_c-libs_posix-tty_tcgetattr.c b/lang/sml-nj-devel/files/do-patch-base_runtime_c-libs_posix-tty_tcgetattr.c
index 94444085efbe..3caf75f458a4 100644
--- a/lang/sml-nj-devel/files/do-patch-src_runtime_c-libs_posix-tty_tcgetattr.c
+++ b/lang/sml-nj-devel/files/do-patch-base_runtime_c-libs_posix-tty_tcgetattr.c
@@ -1,5 +1,5 @@
---- src/runtime/c-libs/posix-tty/tcgetattr.c.orig	Thu Jun  1 20:33:46 2000
-+++ src/runtime/c-libs/posix-tty/tcgetattr.c	Fri Jun  9 12:33:48 2006
+--- base/runtime/c-libs/posix-tty/tcgetattr.c.orig	Thu Jun  1 20:34:03 2000
++++ base/runtime/c-libs/posix-tty/tcgetattr.c	Sun Nov 19 13:36:18 2006
 @@ -40,7 +40,7 @@
      
    /* allocate the vector; note that this might cause a GC */
diff --git a/lang/sml-nj-devel/files/do-patch-src_runtime_c-libs_posix-tty_tcsetattr.c b/lang/sml-nj-devel/files/do-patch-base_runtime_c-libs_posix-tty_tcsetattr.c
index 02628ad4c5e3..3ae6f8faef8d 100644
--- a/lang/sml-nj-devel/files/do-patch-src_runtime_c-libs_posix-tty_tcsetattr.c
+++ b/lang/sml-nj-devel/files/do-patch-base_runtime_c-libs_posix-tty_tcsetattr.c
@@ -1,5 +1,5 @@
---- src/runtime/c-libs/posix-tty/tcsetattr.c.orig	Thu Jun  1 20:33:46 2000
-+++ src/runtime/c-libs/posix-tty/tcsetattr.c	Fri Jun  9 12:33:59 2006
+--- base/runtime/c-libs/posix-tty/tcsetattr.c.orig	Thu Jun  1 20:34:03 2000
++++ base/runtime/c-libs/posix-tty/tcsetattr.c	Sun Nov 19 13:36:18 2006
 @@ -30,7 +30,7 @@
      data.c_oflag = REC_SELWORD(termio_rep, 1);
      data.c_cflag = REC_SELWORD(termio_rep, 2);
diff --git a/lang/sml-nj-devel/files/patch-config_install.sh b/lang/sml-nj-devel/files/patch-config_install.sh
index a16dc077b7de..ebd1fbc1b671 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	Sun Nov 20 06:32:27 2005
-+++ config/install.sh	Tue Apr 11 14:26:13 2006
+--- config/install.sh.orig	Thu Nov  2 22:23:22 2006
++++ config/install.sh	Sun Nov 19 23:51:03 2006
 @@ -18,6 +18,8 @@
      nolib=false
  fi
@@ -61,25 +61,19 @@
 +    do
 +	do_patch $p
 +    done
-     cd "$SRCDIR"/runtime/objs
+     cd "$BASEDIR"/runtime/objs
      echo $this: Compiling the run-time system.
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-@@ -324,7 +358,13 @@
- 	if [ -f runx.$ARCH-$OPSYS ]; then
- 	    mv runx.$ARCH-$OPSYS "$RUNDIR"
+@@ -330,7 +364,7 @@
+ 	if [ -f run.$ARCH-$OPSYS.a ]; then
+ 	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
  	fi
 -	$MAKE MAKE=$MAKE clean
-+	if [ -f run.$ARCH-$OPSYS.so ]; then
-+	    mv run.$ARCH-$OPSYS.so "$RUNDIR"
-+	fi
-+	if [ -f run.$ARCH-$OPSYS.a ]; then
-+	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
-+	fi
 +	[ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -350,7 +390,7 @@
+@@ -356,7 +390,7 @@
  	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
      fi
  else
@@ -88,7 +82,7 @@
  
      fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
  
-@@ -421,5 +461,12 @@
+@@ -427,5 +461,12 @@
  	complain "$this: !!! Installation of libraries and programs failed."
      fi
  fi
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
index 619aac327668..296967475f16 100644
--- a/lang/sml-nj-devel/files/plist-everything
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -1,11 +1,17 @@
+bin/ml-antlr
 bin/ml-burg
 bin/ml-nlffigen
+bin/ml-ulex
 bin/nowhere
+smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd
 smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd
 smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd
+smlnj/bin/.heap/ml-ulex.%%MLARCH%%-bsd
 smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
+smlnj/bin/ml-antlr
 smlnj/bin/ml-burg
 smlnj/bin/ml-nlffigen
+smlnj/bin/ml-ulex
 smlnj/bin/nowhere
 smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm
 smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm
@@ -18,6 +24,9 @@ smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/prec-parser.cm
 smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/sml-ast.cm
 smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/source-map.cm
 smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm
+smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/back-trace.cm
+smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/coverage.cm
+smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/plugins.cm
 @dirrm smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/eXene.cm/.cm
 @dirrm smlnj/lib/eXene.cm
@@ -36,3 +45,6 @@ smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm
 @dirrm smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/pgraph-util.cm/.cm
 @dirrm smlnj/lib/pgraph-util.cm
+@dirrm smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/smlnj-tdp/.cm
+@dirrm smlnj/lib/smlnj-tdp
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index 9e436f50a0a4..1c124980095e 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -31,6 +31,7 @@ smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm
 smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm
 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.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
@@ -74,6 +75,7 @@ smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/cmb.cm
 smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/compiler.cm
 smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/installer.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
+smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/AMD64.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
@@ -88,6 +90,7 @@ smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/cm.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/tools.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/alpha32-unix.cm
+smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/amd64-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/current.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/hppa-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-macos.cm
@@ -97,6 +100,7 @@ smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-win32.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/all.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/alpha32.cm
+smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/amd64.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/compiler.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/current.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/hppa.cm
@@ -118,6 +122,7 @@ smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/html-lib.cm
 smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm
 smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/alpha32.cm
+smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/basics.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/core.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/debugprof.cm
@@ -129,9 +134,6 @@ smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/parser.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/ppc.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm
-smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/back-trace.cm
-smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/coverage.cm
-smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/plugins.cm
 smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/bin/.heap
 @dirrm smlnj/bin/.run
@@ -251,9 +253,6 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/smlnj/viscomp/.cm
 @dirrm smlnj/lib/smlnj/viscomp
 @dirrm smlnj/lib/smlnj
-@dirrm smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj-tdp/.cm
-@dirrm smlnj/lib/smlnj-tdp
 @dirrm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/unix-lib.cm/.cm
 @dirrm smlnj/lib/unix-lib.cm