7 files changed, 187 insertions, 158 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 48f5bb5c4951..4ecbc815c0a8 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,30 +6,30 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.34
+PORTVERSION=	110.37
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PORTVERSION}/ \
 		ftp://flint.cs.yale.edu/pub/smlnj/working/${PORTVERSION}/ \
 		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/${PORTVERSION}/ \
 		ftp://ftp.diku.dk/pub/smlnj/working/${PORTVERSION}/
+DISTFILES=	config.tgz runtime.tgz
 .if (${MACHINE_ARCH} == "i386")
-DISTFILES=	boot.x86-unix.tgz
+DISTFILES+=	boot.x86-unix.tgz
 .elif (${MACHINE_ARCH} == "alpha")
-DISTFILES=	boot.alpha32-unix.tgz
+DISTFILES+=	boot.alpha32-unix.tgz
 .endif
-DISTFILES+=	config.tgz runtime.tgz cm.tgz ckit.tgz \
-		ml-burg.tgz ml-lex.tgz \
+DISTFILES+=	ckit.tgz ml-burg.tgz ml-lex.tgz \
 		ml-nlffi-lib.tgz ml-nlffigen.tgz \
 		ml-yacc.tgz smlnj-lib.tgz
-.if defined(WITH_SRC) || defined(WITH_RECOMPILE) || defined(WITH_FLINT)
-DISTFILES+=	compiler.tgz system.tgz MLRISC.tgz
-.endif
 .if defined(WITH_CML) || defined(WITH_EXENE)
 DISTFILES+=	cml.tgz
 .endif
 .if defined(WITH_EXENE)
 DISTFILES+=	eXene.tgz
 .endif
+.if defined(WITH_SRC) || defined(WITH_RECOMPILE) || defined(WITH_FLINT)
+DISTFILES+=	MLRISC.tgz cm.tgz compiler.tgz system.tgz
+.endif
 EXTRACT_ONLY=	config.tgz
 
 MAINTAINER=	jkoshy@freebsd.org
@@ -39,7 +39,7 @@ MLARCH=		x86
 .elif (${MACHINE_ARCH} == "alpha")
 MLARCH=		alpha32
 .else
-BROKEN=		not ported to ${MLARCH}
+BROKEN=		not ported to ${MACHINE_ARCH}
 .endif
 
 MLTARGETS=	ml-burg ckit ml-nlffi-lib ml-nlffigen
@@ -162,6 +162,8 @@ MLSRCEXCLUDES+=	--exclude "${excl}"
 .endfor
 .endif
 
+PLIST_SUB=	MLARCH=${MLARCH}
+
 do-install:
 	${MKDIR} "${PREFIX}/smlnj"
 	cd ${WRKDIR} && unset PWD && \
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index a1386ccf1033..2084112b1c54 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,16 +1,17 @@
-MD5 (sml-nj/110.34/boot.x86-unix.tgz) = 419904d21e9bba8931697179aed7854e
-MD5 (sml-nj/110.34/config.tgz) = f81d3edd47f7a90e22bda437f097d106
-MD5 (sml-nj/110.34/runtime.tgz) = 518ba48de2d611af1d00e2e60a045e1e
-MD5 (sml-nj/110.34/cm.tgz) = c5db753384209b6329b170d800457315
-MD5 (sml-nj/110.34/ckit.tgz) = c0ea9ce9fc6b05aca87d6acd75870bf3
-MD5 (sml-nj/110.34/ml-burg.tgz) = 2dd6317954e2e1bac4ae509d8aa335bc
-MD5 (sml-nj/110.34/ml-lex.tgz) = dcf53a5f50cd0522c88ae81e81f23d0b
-MD5 (sml-nj/110.34/ml-nlffi-lib.tgz) = c29f3a603570f9fba1cf6bb892050718
-MD5 (sml-nj/110.34/ml-nlffigen.tgz) = e2dec108191b4ccb563aa320534d5097
-MD5 (sml-nj/110.34/ml-yacc.tgz) = dafc62097309b63c108b25a1bb499eb2
-MD5 (sml-nj/110.34/smlnj-lib.tgz) = 44049319612188dc026745f0ee3b7f89
-MD5 (sml-nj/110.34/compiler.tgz) = ab17f4dee4504bb0239f9d378e024bbb
-MD5 (sml-nj/110.34/system.tgz) = 3c10db33bf5d1ea06081d5eb7aa6758b
-MD5 (sml-nj/110.34/MLRISC.tgz) = 57c6f8868baa3d7f4efead0734eeeeeb
-MD5 (sml-nj/110.34/cml.tgz) = c32e6801d7bad2ca5ea0b10bc4a12a18
-MD5 (sml-nj/110.34/eXene.tgz) = 96f4e89eec9ab01eaa873a2b3ebd11fc
+MD5 (sml-nj/110.37/MLRISC.tgz) = 708fb660c795a4f3732be4c8726aa5a4
+MD5 (sml-nj/110.37/boot.alpha32-unix.tgz) = 8d8960f1eb3e1edc5d5c438b4671b333
+MD5 (sml-nj/110.37/boot.x86-unix.tgz) = d767917c71d1785be68b27959f14aabb
+MD5 (sml-nj/110.37/ckit.tgz) = c0fa9466d95c55c6566c5ff580dc9c9d
+MD5 (sml-nj/110.37/cm.tgz) = 309de327ad0802ff3f3513eb1aa459d5
+MD5 (sml-nj/110.37/cml.tgz) = db484536beb7c80accca77c1bae444f9
+MD5 (sml-nj/110.37/compiler.tgz) = 367560e3bd57d077812cfaa7fb0e0076
+MD5 (sml-nj/110.37/config.tgz) = 8dde42fd783995df070f132b8c279e1f
+MD5 (sml-nj/110.37/eXene.tgz) = c05d7779343aaf54e8eda13e9c04e3c6
+MD5 (sml-nj/110.37/ml-burg.tgz) = d9351e39bbc38372950a8d8f53d8a2ad
+MD5 (sml-nj/110.37/ml-lex.tgz) = 770c68dbd4927636c6468dfada438e94
+MD5 (sml-nj/110.37/ml-nlffi-lib.tgz) = 7f9f90448a5e3777980c4907096a0c89
+MD5 (sml-nj/110.37/ml-nlffigen.tgz) = ee09b7f56cd8af9829760c85afa91e65
+MD5 (sml-nj/110.37/ml-yacc.tgz) = d8a58f23a8039f8b32c6b6f4fc97c112
+MD5 (sml-nj/110.37/runtime.tgz) = 3f28b17620d344d1c181c165111cb0e0
+MD5 (sml-nj/110.37/smlnj-lib.tgz) = c5d309dd8b99a8e05c04a4ef721db6a5
+MD5 (sml-nj/110.37/system.tgz) = 70074edfeda6d0b59c1da21cf64fa83d
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-flint-access
index 890534cfb661..6ac420fe7406 100644
--- a/lang/sml-nj-devel/files/optional-patch-flint-access
+++ b/lang/sml-nj-devel/files/optional-patch-flint-access
@@ -1,11 +1,11 @@
---- src/compiler/viscomp-core.cm.orig	Tue May  8 23:25:14 2001
-+++ src/compiler/viscomp-core.cm	Thu Aug  9 00:06:53 2001
-@@ -69,6 +69,26 @@
- 
- 	functor DummyCCallsFn
- 	structure ClusterAnnotation
+--- src/compiler/core.cm.orig	Fri Aug 24 19:48:52 2001
++++ src/compiler/core.cm	Thu Aug 30 11:51:20 2001
+@@ -81,6 +81,26 @@
+ 	signature PICKMOD
+ 	signature UNPICKMOD
+ 	signature FLINT
 +
-+      	(* export of structures required to use FLINT directly -5- *)
++	(* export of structures required to use FLINT directly -5- *)
 +	structure Types
 +	structure Translate
 +	(* in 110.27 already exported above: structure FLINT *)
@@ -26,4 +26,4 @@
 +
  is
  
- TopLevel/batch/batchconfig.sml
+ TopLevel/environ/environ.sig
diff --git a/lang/sml-nj-devel/files/patch-ac b/lang/sml-nj-devel/files/patch-ac
new file mode 100644
index 000000000000..7bebc19dffb3
--- /dev/null
+++ b/lang/sml-nj-devel/files/patch-ac
@@ -0,0 +1,10 @@
+--- config/_arch-n-opsys.orig	Fri Apr 20 15:26:43 2001
++++ config/_arch-n-opsys	Thu Sep 27 16:50:33 2001
+@@ -96,6 +96,7 @@
+       i486) ARCH=x86;;
+       i586) ARCH=x86;;
+       i686) ARCH=x86;;
++      alpha) ARCH=alpha32;;
+       *) exit 1;;
+     esac
+     ;;
diff --git a/lang/sml-nj-devel/files/plist-cml b/lang/sml-nj-devel/files/plist-cml
index 77c1791b46b4..4f6fb60760b1 100644
--- a/lang/sml-nj-devel/files/plist-cml
+++ b/lang/sml-nj-devel/files/plist-cml
@@ -1,12 +1,12 @@
-smlnj/lib/cml/CM/x86-unix/basis.cm
-smlnj/lib/cml/CM/x86-unix/cml-internal.cm
-smlnj/lib/cml/CM/x86-unix/cml.cm
-smlnj/lib/cml/CM/x86-unix/core-cml.cm
-smlnj/lib/cml-lib/CM/x86-unix/smlnj-lib.cm
-smlnj/lib/cml-lib/CM/x86-unix/trace-cml.cm
-@dirrm smlnj/lib/cml/CM/x86-unix
+smlnj/lib/cml/CM/%%MLARCH%%-unix/basis.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/cml-internal.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/cml.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/core-cml.cm
+smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/smlnj-lib.cm
+smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/trace-cml.cm
+@dirrm smlnj/lib/cml/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/cml/CM
 @dirrm smlnj/lib/cml
-@dirrm smlnj/lib/cml-lib/CM/x86-unix
+@dirrm smlnj/lib/cml-lib/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/cml-lib/CM
 @dirrm smlnj/lib/cml-lib
diff --git a/lang/sml-nj-devel/files/plist-eXene b/lang/sml-nj-devel/files/plist-eXene
index a6d10eb14d71..3902a0c46ecb 100644
--- a/lang/sml-nj-devel/files/plist-eXene
+++ b/lang/sml-nj-devel/files/plist-eXene
@@ -1,4 +1,4 @@
-smlnj/lib/eXene.cm/CM/x86-unix/eXene.cm
-@dirrm smlnj/lib/eXene.cm/CM/x86-unix
+smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
+@dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/eXene.cm/CM
 @dirrm smlnj/lib/eXene.cm
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index 0c8eab9c43b6..0e87683ce244 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -6,13 +6,13 @@ bin/ml-nlffigen
 bin/ml-yacc
 bin/sml
 smlnj/bin/.arch-n-opsys
-smlnj/bin/.heap/ml-burg.x86-bsd
-smlnj/bin/.heap/ml-lex.x86-bsd
-smlnj/bin/.heap/ml-nlffigen.x86-bsd
-smlnj/bin/.heap/ml-yacc.x86-bsd
-smlnj/bin/.heap/sml.x86-bsd
+smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd
+smlnj/bin/.heap/ml-lex.%%MLARCH%%-bsd
+smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd
+smlnj/bin/.heap/ml-yacc.%%MLARCH%%-bsd
+smlnj/bin/.heap/sml.%%MLARCH%%-bsd
 smlnj/bin/.link-sml
-smlnj/bin/.run/run.x86-freebsd
+smlnj/bin/.run/run.%%MLARCH%%-freebsd
 smlnj/bin/.run-sml
 smlnj/bin/ml-build
 smlnj/bin/ml-burg
@@ -21,185 +21,201 @@ smlnj/bin/ml-makedepend
 smlnj/bin/ml-nlffigen
 smlnj/bin/ml-yacc
 smlnj/bin/sml
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/ALPHA.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/Control.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/HPPA.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/IA32.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/Lib.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/MLRISC.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/MLTREE.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/PPC.cm
-smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/SPARC.cm
-smlnj/lib/basis.cm/CM/x86-unix/basis.cm
-smlnj/lib/burg-ext.cm/CM/x86-unix/burg-ext.cm
-smlnj/lib/c-int.cm/CM/x86-unix/c-int.cm
-smlnj/lib/c.cm/CM/x86-unix/c.cm
-smlnj/lib/ckit-lib.cm/CM/x86-unix/ckit-lib.cm
-smlnj/lib/dir-tool.cm/CM/x86-unix/dir-tool.cm
-smlnj/lib/grm-ext.cm/CM/x86-unix/grm-ext.cm
-smlnj/lib/html-lib.cm/CM/x86-unix/html-lib.cm
-smlnj/lib/inet-lib.cm/CM/x86-unix/inet-lib.cm
-smlnj/lib/lex-ext.cm/CM/x86-unix/lex-ext.cm
-smlnj/lib/make-tool.cm/CM/x86-unix/make-tool.cm
-smlnj/lib/memory.cm/CM/x86-unix/memory.cm
-smlnj/lib/ml-yacc-lib.cm/CM/x86-unix/ml-yacc-lib.cm
-smlnj/lib/mlburg-tool.cm/CM/x86-unix/mlburg-tool.cm
-smlnj/lib/mllex-tool.cm/CM/x86-unix/mllex-tool.cm
-smlnj/lib/mlyacc-tool.cm/CM/x86-unix/mlyacc-tool.cm
-smlnj/lib/noweb-tool.cm/CM/x86-unix/noweb-tool.cm
-smlnj/lib/nw-ext.cm/CM/x86-unix/nw-ext.cm
+smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/ALPHA.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
+smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/IA32.cm
+smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/Lib.cm
+smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/MLRISC.cm
+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/SPARC.cm
+smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/Visual.cm
+smlnj/lib/basis.cm/CM/%%MLARCH%%-unix/basis.cm
+smlnj/lib/burg-ext.cm/CM/%%MLARCH%%-unix/burg-ext.cm
+smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix/c-int.cm
+smlnj/lib/c.cm/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm
+smlnj/lib/dir-tool.cm/CM/%%MLARCH%%-unix/dir-tool.cm
+smlnj/lib/grm-ext.cm/CM/%%MLARCH%%-unix/grm-ext.cm
+smlnj/lib/html-lib.cm/CM/%%MLARCH%%-unix/html-lib.cm
+smlnj/lib/inet-lib.cm/CM/%%MLARCH%%-unix/inet-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/memory.cm/CM/%%MLARCH%%-unix/memory.cm
+smlnj/lib/ml-yacc-lib.cm/CM/%%MLARCH%%-unix/ml-yacc-lib.cm
+smlnj/lib/mlburg-tool.cm/CM/%%MLARCH%%-unix/mlburg-tool.cm
+smlnj/lib/mllex-tool.cm/CM/%%MLARCH%%-unix/mllex-tool.cm
+smlnj/lib/mlyacc-tool.cm/CM/%%MLARCH%%-unix/mlyacc-tool.cm
+smlnj/lib/noweb-tool.cm/CM/%%MLARCH%%-unix/noweb-tool.cm
+smlnj/lib/nw-ext.cm/CM/%%MLARCH%%-unix/nw-ext.cm
 smlnj/lib/pathconfig
-smlnj/lib/pickle-lib.cm/CM/x86-unix/pickle-lib.cm
-smlnj/lib/pp-lib.cm/CM/x86-unix/pp-lib.cm
-smlnj/lib/reactive-lib.cm/CM/x86-unix/reactive-lib.cm
-smlnj/lib/regexp-lib.cm/CM/x86-unix/regexp-lib.cm
-smlnj/lib/shell-tool.cm/CM/x86-unix/shell-tool.cm
-smlnj/lib/smlnj/CM/x86-unix/cm.cm
-smlnj/lib/smlnj/CM/x86-unix/cmb.cm
-smlnj/lib/smlnj/CM/x86-unix/compiler.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/ALPHA.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/Control.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/HPPA.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/IA32.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/Lib.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/MLRISC.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/MLTREE.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/PPC.cm
-smlnj/lib/smlnj/MLRISC/CM/x86-unix/SPARC.cm
-smlnj/lib/smlnj/cm/CM/x86-unix/cm.cm
-smlnj/lib/smlnj/cm/CM/x86-unix/tools.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/alpha32-unix.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/current.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/hppa-unix.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/ppc-macos.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/ppc-unix.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/sparc-unix.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/x86-unix.cm
-smlnj/lib/smlnj/cmb/CM/x86-unix/x86-win32.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/all.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/alpha32.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/current.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/hppa.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/ppc.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/sparc.cm
-smlnj/lib/smlnj/compiler/CM/x86-unix/x86.cm
-smlnj/lib/smlnj/init/CM/x86-unix/init.cmi
-smlnj/lib/smlnj/internal/CM/x86-unix/cm-lib.cm
-smlnj/lib/smlnj/internal/CM/x86-unix/cm-sig-lib.cm
-smlnj/lib/smlnj/internal/CM/x86-unix/host-compiler-0.cm
-smlnj/lib/smlnj/internal/CM/x86-unix/intsys.cm
-smlnj/lib/smlnj/internal/CM/x86-unix/srcpath-lib.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/alpha32.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/core.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/hppa.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/ppc.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/sparc.cm
-smlnj/lib/smlnj/viscomp/CM/x86-unix/x86.cm
-smlnj/lib/smlnj-lib.cm/CM/x86-unix/smlnj-lib.cm
-smlnj/lib/unix-lib.cm/CM/x86-unix/unix-lib.cm
+smlnj/lib/pgraph.cm/CM/%%MLARCH%%-unix/pgraph.cm
+smlnj/lib/pickle-lib.cm/CM/%%MLARCH%%-unix/pickle-lib.cm
+smlnj/lib/pp-lib.cm/CM/%%MLARCH%%-unix/pp-lib.cm
+smlnj/lib/reactive-lib.cm/CM/%%MLARCH%%-unix/reactive-lib.cm
+smlnj/lib/regexp-lib.cm/CM/%%MLARCH%%-unix/regexp-lib.cm
+smlnj/lib/shell-tool.cm/CM/%%MLARCH%%-unix/shell-tool.cm
+smlnj/lib/smlnj/CM/%%MLARCH%%-unix/cm.cm
+smlnj/lib/smlnj/CM/%%MLARCH%%-unix/cmb.cm
+smlnj/lib/smlnj/CM/%%MLARCH%%-unix/compiler.cm
+smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/ALPHA.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
+smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/IA32.cm
+smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/Lib.cm
+smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/MLRISC.cm
+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/SPARC.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/current.cm
+smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix/hppa-unix.cm
+smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix/ppc-macos.cm
+smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix/ppc-unix.cm
+smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix/sparc-unix.cm
+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/compiler.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/current.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/hppa.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/minimal-only.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/minimal.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/ppc.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/sparc.cm
+smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix/x86.cm
+smlnj/lib/smlnj/init/CM/%%MLARCH%%-unix/init.cmi
+smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix/cm-lib.cm
+smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix/cm-sig-lib.cm
+smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix/cm0.cm
+smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix/intsys.cm
+smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix/srcpath-lib.cm
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/alpha32.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
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/elabdata.cm
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/elaborate.cm
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/execute.cm
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/hppa.cm
+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-lib.cm/CM/%%MLARCH%%-unix/smlnj-lib.cm
+smlnj/lib/unix-lib.cm/CM/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/bin/.heap
 @dirrm smlnj/bin/.run
 @dirrm smlnj/bin
-@dirrm smlnj/lib/SMLNJ-MLRISC/CM/x86-unix
+@dirrm smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/SMLNJ-MLRISC/CM
 @dirrm smlnj/lib/SMLNJ-MLRISC
-@dirrm smlnj/lib/basis.cm/CM/x86-unix
+@dirrm smlnj/lib/basis.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/basis.cm/CM
 @dirrm smlnj/lib/basis.cm
-@dirrm smlnj/lib/burg-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/burg-ext.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/burg-ext.cm/CM
 @dirrm smlnj/lib/burg-ext.cm
-@dirrm smlnj/lib/c-int.cm/CM/x86-unix
+@dirrm smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/c-int.cm/CM
 @dirrm smlnj/lib/c-int.cm
-@dirrm smlnj/lib/c.cm/CM/x86-unix
+@dirrm smlnj/lib/c.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/c.cm/CM
 @dirrm smlnj/lib/c.cm
-@dirrm smlnj/lib/ckit-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/ckit-lib.cm/CM
 @dirrm smlnj/lib/ckit-lib.cm
-@dirrm smlnj/lib/dir-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/dir-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/dir-tool.cm/CM
 @dirrm smlnj/lib/dir-tool.cm
-@dirrm smlnj/lib/grm-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/grm-ext.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/grm-ext.cm/CM
 @dirrm smlnj/lib/grm-ext.cm
-@dirrm smlnj/lib/html-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/html-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/html-lib.cm/CM
 @dirrm smlnj/lib/html-lib.cm
-@dirrm smlnj/lib/inet-lib.cm/CM/x86-unix
+@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/lex-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/lex-ext.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/lex-ext.cm/CM
 @dirrm smlnj/lib/lex-ext.cm
-@dirrm smlnj/lib/make-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/make-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/make-tool.cm/CM
 @dirrm smlnj/lib/make-tool.cm
-@dirrm smlnj/lib/memory.cm/CM/x86-unix
+@dirrm smlnj/lib/memory.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/memory.cm/CM
 @dirrm smlnj/lib/memory.cm
-@dirrm smlnj/lib/ml-yacc-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/ml-yacc-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/ml-yacc-lib.cm/CM
 @dirrm smlnj/lib/ml-yacc-lib.cm
-@dirrm smlnj/lib/mlburg-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mlburg-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlburg-tool.cm/CM
 @dirrm smlnj/lib/mlburg-tool.cm
-@dirrm smlnj/lib/mllex-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mllex-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/mllex-tool.cm/CM
 @dirrm smlnj/lib/mllex-tool.cm
-@dirrm smlnj/lib/mlyacc-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mlyacc-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlyacc-tool.cm/CM
 @dirrm smlnj/lib/mlyacc-tool.cm
-@dirrm smlnj/lib/noweb-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/noweb-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/noweb-tool.cm/CM
 @dirrm smlnj/lib/noweb-tool.cm
-@dirrm smlnj/lib/nw-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/nw-ext.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/nw-ext.cm/CM
 @dirrm smlnj/lib/nw-ext.cm
-@dirrm smlnj/lib/pickle-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/pgraph.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/pgraph.cm/CM
+@dirrm smlnj/lib/pgraph.cm
+@dirrm smlnj/lib/pickle-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/pickle-lib.cm/CM
 @dirrm smlnj/lib/pickle-lib.cm
-@dirrm smlnj/lib/pp-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/pp-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/pp-lib.cm/CM
 @dirrm smlnj/lib/pp-lib.cm
-@dirrm smlnj/lib/reactive-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/reactive-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/reactive-lib.cm/CM
 @dirrm smlnj/lib/reactive-lib.cm
-@dirrm smlnj/lib/regexp-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/regexp-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/regexp-lib.cm/CM
 @dirrm smlnj/lib/regexp-lib.cm
-@dirrm smlnj/lib/shell-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/shell-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/shell-tool.cm/CM
 @dirrm smlnj/lib/shell-tool.cm
-@dirrm smlnj/lib/smlnj/CM/x86-unix
+@dirrm smlnj/lib/smlnj/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/CM
-@dirrm smlnj/lib/smlnj/MLRISC/CM/x86-unix
+@dirrm smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/MLRISC/CM
 @dirrm smlnj/lib/smlnj/MLRISC
-@dirrm smlnj/lib/smlnj/cm/CM/x86-unix
+@dirrm smlnj/lib/smlnj/cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/cm/CM
 @dirrm smlnj/lib/smlnj/cm
-@dirrm smlnj/lib/smlnj/cmb/CM/x86-unix
+@dirrm smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/cmb/CM
 @dirrm smlnj/lib/smlnj/cmb
-@dirrm smlnj/lib/smlnj/compiler/CM/x86-unix
+@dirrm smlnj/lib/smlnj/compiler/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/compiler/CM
 @dirrm smlnj/lib/smlnj/compiler
-@dirrm smlnj/lib/smlnj/init/CM/x86-unix
+@dirrm smlnj/lib/smlnj/init/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/init/CM
 @dirrm smlnj/lib/smlnj/init
-@dirrm smlnj/lib/smlnj/internal/CM/x86-unix
+@dirrm smlnj/lib/smlnj/internal/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/internal/CM
 @dirrm smlnj/lib/smlnj/internal
-@dirrm smlnj/lib/smlnj/viscomp/CM/x86-unix
+@dirrm smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/viscomp/CM
 @dirrm smlnj/lib/smlnj/viscomp
 @dirrm smlnj/lib/smlnj
-@dirrm smlnj/lib/smlnj-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/smlnj-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj-lib.cm/CM
 @dirrm smlnj/lib/smlnj-lib.cm
-@dirrm smlnj/lib/unix-lib.cm/CM/x86-unix
+@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