15 files changed, 549 insertions, 467 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index e1ec346c2596..e4682443efee 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.42
-PORTREVISION=	1
+PORTVERSION=	110.48
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PORTVERSION}/ \
-		ftp://flint.cs.yale.edu/pub/smlnj/working/${PORTVERSION}/ \
-		ftp://gd.tuwien.ac.at/languages/smlnj/working/${PORTVERSION}/
+MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
 DISTFILES=	config.tgz runtime.tgz
-.if (${MACHINE_ARCH} == "i386")
+.include <bsd.port.pre.mk>
+.if (${ARCH} == "i386")
 DISTFILES+=	boot.x86-unix.tgz
-#.elif (${MACHINE_ARCH} == "alpha")
+#.elif (${ARCH} == "alpha")
 #DISTFILES+=	boot.alpha32-unix.tgz
 .endif
 DISTFILES+=	ml-yacc.tgz ml-lex.tgz smlnj-lib.tgz cml.tgz
 .if defined(WITH_EVERYTHING) || defined(WITH_RECOMPILE) || defined(WITH_FLINT)
 DISTFILES+=	ml-burg.tgz \
-		ckit.tgz ml-nlffi-lib.tgz ml-nlffigen.tgz \
+		ckit.tgz ml-nlffi-lib.tgz ml-nlffigen.tgz smlnj-c.tgz \
 		eXene.tgz \
 		MLRISC.tgz cm.tgz compiler.tgz system.tgz
 .endif
@@ -35,15 +33,18 @@ NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 
 NO_LATEST_LINK=	yes
+CONFLICTS=	smlnj-110.0.*
 
 ONLY_FOR_ARCHS=	i386
 
-.if (${MACHINE_ARCH} == "i386")
+.if (${ARCH} == "i386")
 MLARCH=		x86
-#.elif (${MACHINE_ARCH} == "alpha")
+#.elif (${ARCH} == "alpha")
 #MLARCH=		alpha32
 .endif
 
+PLIST_SUB=	MLARCH=${MLARCH}
+
 .if defined(WITH_FLINT)
 WITH_RECOMPILE?=	${WITH_FLINT}
 .endif
@@ -52,25 +53,67 @@ WITH_EVERYTHING?=	${WITH_RECOMPILE}
 .endif
 
 MLROOTRELATIVE=	smlnj
-MLROOT=	${PREFIX}/${MLROOTRELATIVE}
+MLROOT=		${PREFIX}/${MLROOTRELATIVE}
 MLBIN=		${MLROOT}/bin
 MLLIB=		${MLROOT}/lib
 MLSRCSBASE=	ckit src
 MLSRCSRELATIVE=	${MLROOTRELATIVE}/ckit ${MLROOTRELATIVE}/src
-MLSRCS=	${MLROOT}/ckit ${MLROOT}/src
+MLSRCS=		${MLROOT}/ckit ${MLROOT}/src
 MLEXE=		sml ml-yacc ml-lex ml-build ml-makedepend
 .if defined(WITH_EVERYTHING)
 MLTARGETS=	ml-burg eXene src-smlnj \
 		ml-nlffi-lib ml-nlffigen nowhere pgraph-util
 MLEXE+=		ml-burg ml-nlffigen nowhere
 PLIST=		${WRKDIR}/.PLIST
-MLRUNTIMEPLIST=	${WRKDIR}/.PLIST.runtime
-MLSRCPLIST=	${WRKDIR}/.PLIST.src
+MLRUNTIMEPLIST=	${WRKDIR}/.PLIST-runtime
+MLSRCPLIST=	${WRKDIR}/.PLIST-src
 MLPLISTFILES=	${.CURDIR}/pkg-plist ${FILESDIR}/plist-everything \
 		${MLRUNTIMEPLIST} ${MLSRCPLIST}
 .endif
+.if defined(WITH_FLINT)
+MLFLINTPATCH=	optional-patch-src::compiler::core.cm
+.endif
+
+# This is an ugly hack to find out if we need to patch and
+# recompile the core system, because src/system/smlnj/installer
+# currently fails on cross device installs, i.e. if ${WRKDIR}
+# and ${MLROOT} are not on the same partition.
+
+.if !make(describe) && !defined(WITH_RECOMPILE)
+.if defined(WRKDIR)
+MLWRKDIR=	${WRKDIR}
+.else
+MLWRKDIR!=	cd ${.CURDIR} && ${MAKE} describe -V WRKDIR
+.endif
+.if !defined(DF)
+DF!=		${WHICH} df
+.endif
+MLCHROOT!=	${DF} / | ${TAIL} -1 | \
+		${AWK} '{ if ($$NF == "/") pri''ntf "" ; \
+			else pri''ntf "%s", $$NF }'
+MLFINDMOUNT=	'{ if (P == $$NF) MAXMOUNT = P ; else \
+		   if (index(P "/", $$NF) == 1) \
+		   if (length($$NF) > length(MAXMOUNT)) MAXMOUNT = $$NF } \
+		END { print MAXMOUNT }'
+MLWRKDIRMOUNT!=	${DF} | ${AWK} -v P="${MLCHROOT}${MLWRKDIR}" ${MLFINDMOUNT}
+MLROOTMOUNT!=	${DF} | ${AWK} -v P="${MLCHROOT}${MLROOT}" ${MLFINDMOUNT}
+.if ${MLWRKDIRMOUNT} != ${MLROOTMOUNT}
+FORCE_RECOMPILE=	yes
+.if !defined(WITH_EVERYTHING)
+DISTFILES+=	MLRISC.tgz cm.tgz compiler.tgz system.tgz
+.endif
+.endif
+.endif
 
 pre-fetch:
+.if defined(FORCE_RECOMPILE)
+	@${ECHO}
+	@${ECHO} '***** Recompilation enforced because of an installer bug'
+	@${ECHO} '***** for cross device installs. This increases time'
+	@${ECHO} '***** and space required to build the port.'
+	@${ECHO} '***** To avoid this, let WRKDIR (or WRKDIRPREFIX)'
+	@${ECHO} '***** point to the same partition as ${MLROOT}.'
+.endif
 	@${ECHO}
 .if !defined(WITH_EVERYTHING)
 	@${ECHO} 'Use make WITH_EVERYTHING=yes to also build ml-burg'
@@ -97,70 +140,92 @@ pre-fetch:
 # make symlinks to the dist files
 
 post-extract:
-	cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/*  .
+	cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* .
 
 # Configuring is done by uncommenting the appropriate #request xxx
 # lines of config/targets. Dependency details are handled by
-# config/install.sh using config/dependencies.
+# src/system/smlnj/installer using config/dependencies.
 
-.if defined(WITH_EVERYTHING)
+.if defined(WITH_EVERYTHING) || defined(FORCE_RECOMPILE)
 do-configure:
+.if defined(WITH_EVERYTHING)
 	${ECHO_CMD} -n > ${WRKDIR}/.tmp.sed
 .for t in ${MLTARGETS}
 	${ECHO_CMD} '/^#request[ 	]+${t}$$/s/^#//' >> ${WRKDIR}/.tmp.sed
 .endfor
-	${SED} -E -f ${WRKDIR}/.tmp.sed "${WRKDIR}/config/targets" \
+	${SED} -i .default -E -f ${WRKDIR}/.tmp.sed "${WRKDIR}/config/targets"
+.endif
+# Recompilation requires ml-lex and ml-yacc. All requested targets
+# will be built later using the recompiled core system after
+# removing targets.customized. See "do-build" below.
+.if defined(WITH_RECOMPILE) || defined(FORCE_RECOMPILE)
+	( ${ECHO_CMD} "request	ml-yacc" && \
+	  ${ECHO_CMD} "request	ml-lex" ) \
 	> "${WRKDIR}/config/targets.customized"
 .endif
+.endif
 
-# The build target builds and installs the system within the WRKDIR.
-# The src/runtime is not cleaned afterwards to avoid recompilation during
+# The build target patches, builds, and installs the system within WRKDIR.
+# src/runtime is not cleaned afterwards to avoid its recompilation during
 # a subsequent make install.
 # See src/system/README for information on recompiling the compiler.
 
+.if defined(WITH_RECOMPILE) || defined(FORCE_RECOMPILE)
+RECOMPILEDIR=	src/system
+.else
+RECOMPILEDIR=
+.endif
+
+.if defined(WITH_EVERYTHING) || defined(FORCE_RECOMPILE)
+MLSOURCEUNPACKTARGETS=	cm compiler mlrisc smlnj-lib system
+MLSOURCEPATCHES!=	cd ${FILESDIR} && ${LS} do-patch-src::*
 .if defined(WITH_FLINT)
-MLFLINTPATCH=	optional-patch-flint-access
+MLSOURCEPATCHES+=	${MLFLINTPATCH}
+.endif
+.else
+MLSOURCEUNPACKTARGETS=
+MLSOURCEPATCHES=
 .endif
 
 do-build:
-.if defined(WITH_RECOMPILE)
-	${MV} "${WRKDIR}/config/targets.customized" \
-	"${WRKDIR}/config/targets.customized.later"
-	${SED} -E -e '/^#request[        ]+src-smlnj$$/s/^#//' \
-	"${WRKDIR}/config/targets" > "${WRKDIR}/config/targets.customized"
-.endif
 	cd ${WRKDIR} && unset PWD && \
-	FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \
-	MLNORUNTIMECLEAN=yes	./config/install.sh
-.if defined(WITH_FLINT)
-	${TEST} -f "${WRKDIR}/.patch.${MLFLINTPATCH}" || \
-	( cd ${WRKDIR} && \
-	${PATCH} < "${FILESDIR}/${MLFLINTPATCH}" && \
-	${TOUCH} "${WRKDIR}/.patch.${MLFLINTPATCH}" )
-.endif
-.if defined(WITH_RECOMPILE)
-	cd ${WRKDIR}/src/system && ( \
+	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
+	MLNORUNTIMECLEAN=yes \
+	MLSOURCEUNPACKTARGETS="${MLSOURCEUNPACKTARGETS}" \
+	MLSOURCEPATCHES="${MLSOURCEPATCHES}"	./config/install.sh
+.if defined(WITH_RECOMPILE) || defined(FORCE_RECOMPILE)
+	${RM} ${WRKDIR}/config/targets.customized
+	@${ECHO} '(* Recompiling the core system: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
 	${ECHO_CMD} 'CMB.make ();' ) | \
-	../../bin/sml && \
-	./makeml && \
+	../../bin/sml
+	@${ECHO} '(* Building the recompiled heap: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	./makeml
+	@${ECHO} '(* Removing old libs and heaps: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && \
 	${RM} -rf ../../lib && ${MKDIR} ../../lib && \
 	${FIND} ../../bin/.heap -name '*.${MLARCH}-bsd' \
-	\! -name 'sml.${MLARCH}-bsd' -delete && \
-	./installml && \
-	${MV} "${WRKDIR}/config/targets.customized.later" \
-	"${WRKDIR}/config/targets.customized"
+	\! -name 'sml.${MLARCH}-bsd' -delete -print
+	@${ECHO} '(* Installing the recompiled libs and heap: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	./installml
+	@${ECHO} '(* Building requested targets: *)'
 	cd ${WRKDIR} && unset PWD && \
-	FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \
-	MLNORUNTIMECLEAN=yes	./config/install.sh
+	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
+	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \
+	./config/install.sh
 .endif
 
-# Nowadays PLIST has to be computed before installation. We do it in 
+# Nowadays PLIST has to be computed before installation. We do it in
 # "pre-install" because source extraction happens during "build".
+
 .if defined(WITH_EVERYTHING)
-MLNOINSTALL=	CM
-.if defined(WITH_RECOMPILE)
-MLNOINSTALL+=	sml.boot.${MLARCH}-unix sml.bin.${MLARCH}-unix
+MLNOINSTALL=	.cm
+.if defined(WITH_RECOMPILE) || defined(FORCE_RECOMPILE)
+MLNOINSTALL+=	sml.bin.${MLARCH}-unix sml.boot.${MLARCH}-unix \
+		sml.lib sml.${MLARCH}-bsd
 .endif
 MLSRCEXCLUDEREGEX=	-e '^(@dirrm\ )?${MLROOTRELATIVE}/src/runtime'
 .for excl in ${MLNOINSTALL}
@@ -168,7 +233,7 @@ MLSRCEXCLUDEREGEX+=	-e '/${excl}$$' -e '/${excl}/'
 .endfor
 
 pre-install:
-	@${ECHO} -n 'Computing package list ...'
+	@${ECHO} -n '(* Computing package list ...'
 	@${TAR} -tzf ${WRKDIR}/runtime.tgz | \
 	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/src/\1%' \
 		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/src/\1%' \
@@ -181,7 +246,7 @@ pre-install:
 	${EGREP} -v ${MLSRCEXCLUDEREGEX} > ${MLSRCPLIST}
 	@${GREP} -h ^[^@] ${MLPLISTFILES} | ${SORT} -u > ${PLIST}
 	@${GREP} -h ^@dirrm ${MLPLISTFILES} | ${SORT} -r -u >> ${PLIST}
-	@${ECHO} ' done.'
+	@${ECHO} ' done. *)'
 .endif
 
 # The install target installs the heaps and libraries to their final
@@ -196,48 +261,45 @@ MLSRCEXCLUDES+=	--exclude "${excl}"
 .endfor
 .endif
 
-PLIST_SUB=	MLARCH=${MLARCH}
-
 do-install:
 	${MKDIR} "${MLROOT}"
-.if defined(WITH_RECOMPILE)
-	${MV} "${WRKDIR}/config/targets.customized" \
-	"${WRKDIR}/config/targets.customized.later"
-	${ECHO_CMD} -n > "${WRKDIR}/config/targets.customized"
-.endif
+.if !defined(WITH_RECOMPILE) && !defined(FORCE_RECOMPILE)
 	cd ${WRKDIR} && unset PWD && \
-	FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \
-	INSTALLDIR="$(MLROOT)"	./config/install.sh
-	MLARCHOPSYS=`$(MLBIN)/.arch-n-opsys` && \
-	( eval $${MLARCHOPSYS} ; \
-	$(STRIP_CMD) "$(MLBIN)/.run/run.$${ARCH}-$${OPSYS}" )
-.if defined(WITH_RECOMPILE)
-	cd ${WRKDIR}/src/system && \
-	INSTALLROOT="${MLROOT}" ./makeml && \
-	${RM} -rf "${MLLIB}" && ${MKDIR} "${MLLIB}" && \
-	${FIND}  "${MLBIN}"/.heap -name '*.${MLARCH}-bsd' \
-	\! -name 'sml.${MLARCH}-bsd' -delete && \
-	INSTALLROOT="${MLROOT}" ./installml
-	${MV} "${WRKDIR}/config/targets.customized.later" \
-	"${WRKDIR}/config/targets.customized"
+	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
+	INSTALLDIR="${MLROOT}" ./config/install.sh
+.else
+	@${ECHO} '(* Rebuilding the recompiled libs: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
+	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+	${ECHO_CMD} 'CMB.make ();' ) | \
+	../../bin/sml
+	@${ECHO} '(* Rebuilding the recompiled heap: *)'
+	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	./makeml
+	@${ECHO} '(* Installing into ${MLROOT}: *)'
 	cd ${WRKDIR} && unset PWD && \
-	FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \
-	INSTALLDIR="$(MLROOT)"	./config/install.sh
+	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
+	INSTALLDIR="${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \
+	./config/install.sh
 .endif
+	MLARCHOPSYS=`${MLBIN}/.arch-n-opsys` && \
+	( eval $${MLARCHOPSYS} ; \
+	${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} -n 'Installing sources into ${MLROOT} ...'
+	@${ECHO} -n '(* Installing sources into ${MLROOT} ...'
 	@cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCSBASE} | \
 	${TAR} -xf - -C "${MLROOT}"
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${MLSRCS}
-	@${ECHO} ' done.'
+	@${ECHO} ' done. *)'
 .endif
 
 post-install:
-	${MKDIR} $(PREFIX)/bin
-.for f in $(MLEXE)
-	${LN} -s $(MLBIN)/$f $(PREFIX)/bin/$f
+	${MKDIR} ${PREFIX}/bin
+.for f in ${MLEXE}
+	${LN} -s ${MLBIN}/$f ${PREFIX}/bin/$f
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index 72b75eb8fc00..84298ee3232c 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,34 +1,34 @@
-MD5 (sml-nj/110.42/MLRISC.tgz) = 34a96fb72a0304fbb583c935a8036731
-SIZE (sml-nj/110.42/MLRISC.tgz) = 1173187
-MD5 (sml-nj/110.42/boot.alpha32-unix.tgz) = 66d81f711641c897afd6dc24d5ce695b
-SIZE (sml-nj/110.42/boot.alpha32-unix.tgz) = 5038341
-MD5 (sml-nj/110.42/boot.x86-unix.tgz) = 68c57ff4f1e91c76abb47bab76476567
-SIZE (sml-nj/110.42/boot.x86-unix.tgz) = 5147025
-MD5 (sml-nj/110.42/ckit.tgz) = 3dffb716ebfa3106d35dd1eec15584bf
-SIZE (sml-nj/110.42/ckit.tgz) = 168000
-MD5 (sml-nj/110.42/cm.tgz) = 132af0c848505b2d9f4b84e8e399dd06
-SIZE (sml-nj/110.42/cm.tgz) = 202633
-MD5 (sml-nj/110.42/cml.tgz) = 5418fecfdf569e356a6b5f00ed808ac9
-SIZE (sml-nj/110.42/cml.tgz) = 128485
-MD5 (sml-nj/110.42/compiler.tgz) = 5dbefa9e5b639e9bab19813661d5c0ea
-SIZE (sml-nj/110.42/compiler.tgz) = 704669
-MD5 (sml-nj/110.42/config.tgz) = 43e569b0c702466d2a3c851fbf5cc8a8
-SIZE (sml-nj/110.42/config.tgz) = 13660
-MD5 (sml-nj/110.42/eXene.tgz) = 0f303ecba76f750ab1b0e38e17428fba
-SIZE (sml-nj/110.42/eXene.tgz) = 695431
-MD5 (sml-nj/110.42/ml-burg.tgz) = efa7b9b411f2a674e39383d723040c64
-SIZE (sml-nj/110.42/ml-burg.tgz) = 31696
-MD5 (sml-nj/110.42/ml-lex.tgz) = 00569c04368da182310eed501a87f787
-SIZE (sml-nj/110.42/ml-lex.tgz) = 32108
-MD5 (sml-nj/110.42/ml-nlffi-lib.tgz) = d89b952918cbb2ee4cadda60a039aa91
-SIZE (sml-nj/110.42/ml-nlffi-lib.tgz) = 33645
-MD5 (sml-nj/110.42/ml-nlffigen.tgz) = 61eb86025200e7c474931267069174ee
-SIZE (sml-nj/110.42/ml-nlffigen.tgz) = 28836
-MD5 (sml-nj/110.42/ml-yacc.tgz) = 362edafbf2fdbda35505ac9784c86ee2
-SIZE (sml-nj/110.42/ml-yacc.tgz) = 95608
-MD5 (sml-nj/110.42/runtime.tgz) = 2fbd0a8bf452c7ada0369fec1c3b732c
-SIZE (sml-nj/110.42/runtime.tgz) = 313057
-MD5 (sml-nj/110.42/smlnj-lib.tgz) = 294b04dd18877c1c7848adf12aae3c3f
-SIZE (sml-nj/110.42/smlnj-lib.tgz) = 251230
-MD5 (sml-nj/110.42/system.tgz) = 895cb636155b981a2c6f916af067b6d5
-SIZE (sml-nj/110.42/system.tgz) = 177548
+MD5 (sml-nj/110.48/MLRISC.tgz) = be5634989f8552d06b8ef759a894a0ff
+SIZE (sml-nj/110.48/MLRISC.tgz) = 1225014
+MD5 (sml-nj/110.48/boot.x86-unix.tgz) = e17f1ec4ceffae893737ab4bfc11184b
+SIZE (sml-nj/110.48/boot.x86-unix.tgz) = 5340737
+MD5 (sml-nj/110.48/ckit.tgz) = 96718e9bbc38e84048c872f47d1e932c
+SIZE (sml-nj/110.48/ckit.tgz) = 168181
+MD5 (sml-nj/110.48/cm.tgz) = 246df99f105f5b8140f54867a17a7e62
+SIZE (sml-nj/110.48/cm.tgz) = 204169
+MD5 (sml-nj/110.48/cml.tgz) = 206d84049bd9b640ee41699e7fe17433
+SIZE (sml-nj/110.48/cml.tgz) = 103610
+MD5 (sml-nj/110.48/compiler.tgz) = db1b043d74b39869f991753f722a96c7
+SIZE (sml-nj/110.48/compiler.tgz) = 736220
+MD5 (sml-nj/110.48/config.tgz) = c839eb70b6e1bdb1081ad35d55ad3b18
+SIZE (sml-nj/110.48/config.tgz) = 13225
+MD5 (sml-nj/110.48/eXene.tgz) = eee26540c5b51f80ab40bfb5452096b0
+SIZE (sml-nj/110.48/eXene.tgz) = 695314
+MD5 (sml-nj/110.48/ml-burg.tgz) = 913445e9430387647a9a9fdc4af1bbd3
+SIZE (sml-nj/110.48/ml-burg.tgz) = 31550
+MD5 (sml-nj/110.48/ml-lex.tgz) = f4ac4548b717eca6f050927ef8b7356f
+SIZE (sml-nj/110.48/ml-lex.tgz) = 32383
+MD5 (sml-nj/110.48/ml-nlffi-lib.tgz) = 084f88460e1d71af423677c8687cac39
+SIZE (sml-nj/110.48/ml-nlffi-lib.tgz) = 42621
+MD5 (sml-nj/110.48/ml-nlffigen.tgz) = 09eba0bb0dfe21c28b74f2d5e0563d86
+SIZE (sml-nj/110.48/ml-nlffigen.tgz) = 29419
+MD5 (sml-nj/110.48/ml-yacc.tgz) = 3deb41bc31101f20d3b7b299205983ca
+SIZE (sml-nj/110.48/ml-yacc.tgz) = 95044
+MD5 (sml-nj/110.48/runtime.tgz) = 6fcabe42b728d0846331ecb420582623
+SIZE (sml-nj/110.48/runtime.tgz) = 322353
+MD5 (sml-nj/110.48/smlnj-c.tgz) = b1c88b648dd2bb06a8216d87b0d389e6
+SIZE (sml-nj/110.48/smlnj-c.tgz) = 10538
+MD5 (sml-nj/110.48/smlnj-lib.tgz) = 5fa9f377e0450f3fdbd00b9ad47b3c28
+SIZE (sml-nj/110.48/smlnj-lib.tgz) = 217133
+MD5 (sml-nj/110.48/system.tgz) = ed75414a1faa4c645fd4368f9e2f9894
+SIZE (sml-nj/110.48/system.tgz) = 209886
diff --git a/lang/sml-nj-devel/files/do-patch-src-genposixnames b/lang/sml-nj-devel/files/do-patch-src-genposixnames
deleted file mode 100644
index b59f441d0803..000000000000
--- a/lang/sml-nj-devel/files/do-patch-src-genposixnames
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/runtime/config/gen-posix-names.sh.orig	Mon Nov 27 14:24:39 2000
-+++ src/runtime/config/gen-posix-names.sh	Tue Mar 11 23:09:11 2003
-@@ -39,17 +39,20 @@
-   echo "#include <unistd.h>" > $SRCFILE
-   $CPP $SRCFILE > $INCLFILE
-   rm -f $SRCFILE
--elif [ -r "/usr/include/sys/unistd.h" ]; then
--  INCLFILE=/usr/include/sys/unistd.h
--elif [ -r "/usr/include/confname.h" ]; then
--  INCLFILE=/usr/include/confname.h
--elif [ -r "/usr/include/unistd.h" ]; then
--  INCLFILE=/usr/include/unistd.h
--elif [ -r "/usr/include/bsd/unistd.h" ]; then
--  INCLFILE=/usr/include/bsd/unistd.h
- else
--  echo "gen-posix-names.sh: unable to find <unistd.h>"
--  exit 1
-+  INCLFILE=""
-+  for f in "/usr/include/sys/unistd.h" \
-+    "/usr/include/confname.h"          \
-+    "/usr/include/unistd.h"            \
-+    "/usr/include/bsd/unistd.h"; do
-+    if [ -r "$f" ]; then
-+      INCLFILE="$INCLFILE $f"
-+    fi
-+  done
-+  if [ -z "$INCLFILE" ]; then
-+    echo "gen-posix-names.sh: unable to find <unistd.h>"
-+    exit 1
-+  fi
- fi
- 
- echo "/* $OUTF" >> $OUTF
diff --git a/lang/sml-nj-devel/files/do-patch-src-installml b/lang/sml-nj-devel/files/do-patch-src-installml
deleted file mode 100644
index 542d987ece6a..000000000000
--- a/lang/sml-nj-devel/files/do-patch-src-installml
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/system/installml.orig	Thu Jun  1 20:33:57 2000
-+++ src/system/installml	Wed Aug 15 18:49:56 2001
-@@ -3,7 +3,7 @@
- # The tmpfile is for pathconfig editing (see below).
- tmpfile=pathconfig.tmp.$$
- 
--trap 'rm -f $tmpfile; exit 1' 0 1 2 3 15
-+trap 'rm -f $tmpfile; exit 1' 1 2 3 15
- 
- this=$0
- here=`pwd`
-@@ -11,8 +11,10 @@
- twoup=`pwd`
- cd $here
- 
--MAIN_HEAP_DIR=$twoup/bin/.heap
--MAIN_LIB_DIR=$twoup/lib
-+INSTALLROOT=${INSTALLROOT:-$twoup}
-+
-+MAIN_HEAP_DIR=$INSTALLROOT/bin/.heap
-+MAIN_LIB_DIR=$INSTALLROOT/lib
- 
- if [ $# -gt 0 ] ; then
-     STEM=$1
-@@ -54,7 +56,7 @@
-     fi
- }
- 
--HEAP_FILE=$STEM.$ARCH-$OPSYS
-+HEAP_FILE=$STEM.$HEAP_SUFFIX
- LIB_DIR=$STEM.lib
- 
- if [ ! -f $HEAP_FILE ] ; then
-@@ -68,7 +70,7 @@
- fi
- 
- # Moving the heap image to its place
--mv $HEAP_FILE $MAIN_HEAP_DIR/sml.$ARCH-$OPSYS
-+mv $HEAP_FILE $MAIN_HEAP_DIR/sml.$HEAP_SUFFIX
- 
- # Moving each individual library...
- cd $LIB_DIR
-@@ -94,4 +96,5 @@
- END { for (i in mapping) print i, mapping[i] }' \
-  | sort >$pcfile
- 
-+rm -f $tmpfile
- rm -r $LIB_DIR
diff --git a/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd b/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd
deleted file mode 100644
index ec415313690b..000000000000
--- a/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/runtime/objs/mk.x86-freebsd.orig	Mon Nov  6 22:41:04 2000
-+++ src/runtime/objs/mk.x86-freebsd	Thu Aug 14 06:06:06 2003
-@@ -10,7 +10,7 @@
- ARFLAGS =	Trcv
- CC =		gcc -ansi
- CFLAGS =	-O2
--CPP =		gcc -x c -E -P -ansi
-+CPP =		gcc -x assembler-with-cpp -E -P
- #CPP =		/usr/bin/cpp -P
- 
- XOBJS =
diff --git a/lang/sml-nj-devel/files/do-patch-src::system::installml b/lang/sml-nj-devel/files/do-patch-src::system::installml
new file mode 100644
index 000000000000..4b74cb918d0d
--- /dev/null
+++ b/lang/sml-nj-devel/files/do-patch-src::system::installml
@@ -0,0 +1,15 @@
+--- src/system/installml.orig	Tue May 11 21:20:17 2004
++++ src/system/installml	Thu Aug  5 22:17:28 2004
+@@ -11,8 +11,10 @@
+ twoup=`pwd`
+ cd $here
+ 
+-MAIN_HEAP_DIR=$twoup/bin/.heap
+-MAIN_LIB_DIR=$twoup/lib
++INSTALLROOT=${INSTALLROOT:-$twoup}
++
++MAIN_HEAP_DIR=$INSTALLROOT/bin/.heap
++MAIN_LIB_DIR=$INSTALLROOT/lib
+ 
+ if [ $# -gt 0 ] ; then
+     STEM=$1
diff --git a/lang/sml-nj-devel/files/do-patch-src-makeml b/lang/sml-nj-devel/files/do-patch-src::system::makeml
index 8be80ccde9de..8be80ccde9de 100644
--- a/lang/sml-nj-devel/files/do-patch-src-makeml
+++ b/lang/sml-nj-devel/files/do-patch-src::system::makeml
diff --git a/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml b/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml
new file mode 100644
index 000000000000..1ffa5bd5647e
--- /dev/null
+++ b/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml
@@ -0,0 +1,53 @@
+--- src/system/smlnj/installer/libinstall.sml.orig	Tue Jul 13 20:49:54 2004
++++ src/system/smlnj/installer/libinstall.sml	Thu Aug 12 01:23:08 2004
+@@ -78,9 +78,40 @@
+     fun mkdir "" = ()
+       | mkdir d = if fexists d then () else (mkdir (P.dir d); F.mkDir d)
+ 
++    (* hack for cross-device moves *)
++    val move = if isUnix
++	then fn args as { old : string, new : string } =>
++		let val xdev_exnName = "SysErr\000"
++		    val xdev_exnMessage_substring = "xdev"
++		in F.rename args
++		   handle exn =>
++			if exnName exn = xdev_exnName
++			then if String.isSubstring xdev_exnMessage_substring
++						   (exnMessage exn)
++			     then if OS.Process.system
++					("mv '" ^ old ^ "' '" ^ new ^ "'")
++				     = OS.Process.success
++				  then print ("(* cross device mv of \"" ^ old
++						^ "\" to \"" ^ new
++						^ "\" done. *)\n")
++				  else fail ["move: mv " ^ old ^ " " ^ new
++						 ^ " failed.\n"]
++			      else ( print ("(* move: \""
++						^ xdev_exnMessage_substring
++						^ "\" not found in \""
++						^ (exnMessage exn)
++						^ "\". *)\n") ;
++				     raise exn )
++			else ( print ("(* move: \"" ^ xdev_exnName
++					^ "\" != \""
++					^ (exnName exn) ^ "\". *)\n") ;
++			       raise exn )
++		end
++	else F.rename
++
+     (* move a stable library file to its final location *)
+     fun movelib src dst () =
+-	(mkdir (P.dir dst); F.rename { old = src, new = dst })
++	(mkdir (P.dir dst); move { old = src, new = dst })
+ 
+     (* register a temporary anchor-value binding *)
+     fun localanchor { anchor, path } =
+@@ -325,7 +356,7 @@
+ 		 F.chDir treedir;
+ 		 if OS.Process.system buildcmd = OS.Process.success then
+ 		     if fexists targetheaploc then
+-			 (F.rename { old = targetheaploc,
++			 (move { old = targetheaploc,
+ 				     new = finalheaploc };
+ 			  instcmd target;
+ 			  #set (CM.Anchor.anchor target) (SOME bindir))
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-src::compiler::core.cm
index 8469e964adb0..9b800c89ca0d 100644
--- a/lang/sml-nj-devel/files/optional-patch-flint-access
+++ b/lang/sml-nj-devel/files/optional-patch-src::compiler::core.cm
@@ -1,14 +1,12 @@
---- src/compiler/core.cm.orig	Fri Dec 14 22:01:23 2001
-+++ src/compiler/core.cm	Thu Feb 28 02:43:48 2002
-@@ -81,6 +81,26 @@
- 	signature PICKMOD
- 	signature UNPICKMOD
- 	signature FLINT
+--- src/compiler/core.cm.orig	Fri Jul 16 05:26:38 2004
++++ src/compiler/core.cm	Fri Aug  6 00:23:27 2004
+@@ -109,6 +109,23 @@
+ 	signature PPTYPE
+ 	signature ACCESS
+ 	signature UNIFY
 +
 +	(* export of structures required to use FLINT directly -5- *)
-+	structure Types
 +	structure Translate
-+	(* in 110.27 already exported above: structure FLINT *)
 +	structure LtyKernel
 +	structure PrimTyc  
 +	structure LtyDef
@@ -21,7 +19,6 @@
 +	structure LambdaVar
 +	structure ChkFlint
 +	(* accessible via GenericVC: structure Symbol *)
-+	structure Access
 +	structure DebIndex
 +
  is
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
deleted file mode 100644
index 718c362fbfaa..000000000000
--- a/lang/sml-nj-devel/files/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
---- config/install.sh.orig	Thu Oct 17 15:07:53 2002
-+++ config/install.sh	Mon Mar 17 02:11:26 2003
-@@ -550,6 +550,28 @@
- ######################################################################
- 
- #
-+# do_patch patch-file
-+# apply a patch file
-+do_patch() {
-+	patchfile=$FILESDIR/$1
-+
-+	if [ ! -r $patchfile ]; then
-+		echo "$this: !!! patch file $patchfile not found."
-+		exit 1;
-+	fi
-+
-+	if [ ! -f $CONFIGDIR/.patch_$1 ]; then 
-+		$PATCH $PATCH_ARGS < $patchfile || {\
-+			echo "$this: !!! patch file $patchfile failed to patch."
-+			exit 1;
-+		}
-+		echo > $CONFIGDIR/.patch_$1
-+	else
-+		echo "$this: patch $patchfile already installed."
-+	fi
-+}
-+
-+#
- # create the various sub directories
- #
- for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
-@@ -656,6 +678,8 @@
- # build the run-time system
- #
- unpack "run-time" $SRCDIR runtime runtime
-+do_patch do-patch-src-genposixnames
-+do_patch do-patch-src-mk.x86-freebsd
- if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
-     vsay $this: Run-time system already exists.
- else
-@@ -664,7 +688,7 @@
-     $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-     if [ -x run.$ARCH-$OPSYS ]; then
- 	mv run.$ARCH-$OPSYS $RUNDIR
--	$MAKE MAKE=$MAKE clean
-+	[ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
-     else
- 	complain "$this: !!! Run-time system build failed for some reason."
-     fi
-@@ -728,6 +752,8 @@
- 	do
- 	    unpack $src $ROOT/src $src $src
-         done
-+	do_patch do-patch-src-makeml
-+	do_patch do-patch-src-installml
- 	;;
-       ml-yacc)
- 	standalone ml-yacc ML-Yacc src
diff --git a/lang/sml-nj-devel/files/patch-ac b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys
index 150a4ebb5d6e..1daf1a7f4070 100644
--- a/lang/sml-nj-devel/files/patch-ac
+++ b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys
@@ -1,6 +1,6 @@
---- config/_arch-n-opsys.orig	Thu Oct 10 22:18:48 2002
-+++ config/_arch-n-opsys	Sun Nov 10 23:59:17 2002
-@@ -100,6 +100,7 @@
+--- config/_arch-n-opsys.orig	Mon Oct 27 15:46:57 2003
++++ config/_arch-n-opsys	Fri Nov 28 22:47:10 2003
+@@ -101,6 +101,7 @@
        i486) ARCH=x86;;
        i586) ARCH=x86;;
        i686) ARCH=x86;;
diff --git a/lang/sml-nj-devel/files/patch-config::install.sh b/lang/sml-nj-devel/files/patch-config::install.sh
new file mode 100644
index 000000000000..d37984e2c11b
--- /dev/null
+++ b/lang/sml-nj-devel/files/patch-config::install.sh
@@ -0,0 +1,95 @@
+--- config/install.sh.orig	Sat Jul 31 00:55:23 2004
++++ config/install.sh	Thu Aug 12 16:14:55 2004
+@@ -12,6 +12,8 @@
+ # Author: Matthias Blume (blume@tti-c.org)
+ #
+ 
++[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"
++
+ if [ x${INSTALL_QUIETLY} = xtrue ] ; then
+     export CM_VERBOSE
+     CM_VERBOSE=false
+@@ -32,6 +34,28 @@
+     exit 1
+ }
+ 
++#
++# do_patch patch-file
++# apply a patch file
++do_patch() {
++	patchfile=$FILESDIR/$1
++
++	if [ ! -r $patchfile ]; then
++		echo "$this: !!! patch file $patchfile not found."
++		exit 1;
++	fi
++
++	if [ ! -f $CONFIGDIR/.patch_$1 ]; then
++		$PATCH $PATCH_ARGS < $patchfile || {\
++			echo "$this: !!! patch file $patchfile failed to patch."
++			exit 1;
++		}
++		echo > $CONFIGDIR/.patch_$1
++	else
++		echo "$this: patch $patchfile already installed."
++	fi
++}
++
+ this=$0
+ 
+ 
+@@ -299,7 +323,12 @@
+ # the name of the bin files directory
+ #
+ BOOT_ARCHIVE=boot.$ARCH-unix
+-BOOT_FILES=sml.$BOOT_ARCHIVE
++if [ -z "$RECOMPILEDIR" ]
++then
++	BOOT_FILES=sml.$BOOT_ARCHIVE
++else
++	BOOT_FILES=$RECOMPILEDIR/sml.$BOOT_ARCHIVE
++fi
+ 
+ #
+ # build the run-time system
+@@ -313,7 +342,7 @@
+     $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
+     if [ -x run.$ARCH-$OPSYS ]; then
+ 	mv run.$ARCH-$OPSYS $RUNDIR
+-	$MAKE MAKE=$MAKE clean
++	[ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
+     else
+ 	complain "$this: !!! Run-time system build failed for some reason."
+     fi
+@@ -330,7 +359,7 @@
+     export CM_DIR_ARC
+     CM_DIR_ARC=$ORIG_CM_DIR_ARC
+ else
+-    $CONFIGDIR/unpack $ROOT $BOOT_ARCHIVE
++    [ -n "$RECOMPILEDIR" ] || $CONFIGDIR/unpack $ROOT $BOOT_ARCHIVE
+ 
+     fish $ROOT/$BOOT_FILES/basis.cm
+ 
+@@ -399,5 +428,22 @@
+ else
+     complain "$this: !!! Installation of libraries and programs failed."
+ fi
++
++# extract required sources
++while [ -n "$MLSOURCEUNPACKTARGETS" ]
++do
++	t=`echo "$MLSOURCEUNPACKTARGETS" | cut -f 1 -d " "`
++	$CONFIGDIR/unpack $ROOT $t
++	[ "$MLSOURCEUNPACKTARGETS" = "$t" ] && break
++	MLSOURCEUNPACKTARGETS=`echo "$MLSOURCEUNPACKTARGETS" | cut -f 2- -d " "`
++done
++# apply source patches
++while [ -n "$MLSOURCEPATCHES" ]
++do
++	p=`echo "$MLSOURCEPATCHES" | cut -f 1 -d " "`
++	do_patch $p
++	[ "$MLSOURCEPATCHES" = "$p" ] && break
++	MLSOURCEPATCHES=`echo "$MLSOURCEPATCHES" | cut -f 2- -d " "`
++done
+ 
+ exit 0
diff --git a/lang/sml-nj-devel/files/patch-config::targets b/lang/sml-nj-devel/files/patch-config::targets
new file mode 100644
index 000000000000..d0e010f35d77
--- /dev/null
+++ b/lang/sml-nj-devel/files/patch-config::targets
@@ -0,0 +1,11 @@
+--- config/targets.orig	Thu Aug  5 00:05:00 2004
++++ config/targets	Tue Aug 10 11:00:56 2004
+@@ -68,7 +68,7 @@
+ # pre-compile (certain) parts of MLRISC that are not already part of the SML/NJ
+ # compiler itself
+ #
+-request mlrisc
++#request mlrisc
+ 
+ # pre-compile and install the C-Kit, which is a library for parsing and
+ # type-checking C programs
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
index 2fb22613d83a..11e1c4b06765 100644
--- a/lang/sml-nj-devel/files/plist-everything
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -7,38 +7,36 @@ smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
 smlnj/bin/ml-burg
 smlnj/bin/ml-nlffigen
 smlnj/bin/nowhere
-smlnj/lib/c/CM/%%MLARCH%%-unix/c.cm
-smlnj/lib/c/internals/CM/%%MLARCH%%-unix/c-int.cm
-smlnj/lib/c/memory/CM/%%MLARCH%%-unix/memory.cm
-smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm
-smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
-smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/match-compiler.cm
-smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/parser.cm
-smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/pp.cm
-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/src/runtime/config/gen-posix-names.sh.orig
-smlnj/src/runtime/objs/mk.%%MLARCH%%-freebsd.orig
-@dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/eXene.cm/CM
+smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm
+smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm
+smlnj/lib/c/memory/.cm/%%MLARCH%%-unix/memory.cm
+smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm
+smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix/eXene.cm
+smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/match-compiler.cm
+smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/parser.cm
+smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/pp.cm
+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
+@dirrm smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/eXene.cm/.cm
 @dirrm smlnj/lib/eXene.cm
-@dirrm smlnj/lib/c/memory/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c/memory/CM
+@dirrm smlnj/lib/c/memory/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/memory/.cm
 @dirrm smlnj/lib/c/memory
-@dirrm smlnj/lib/c/internals/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c/internals/CM
+@dirrm smlnj/lib/c/internals/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/internals/.cm
 @dirrm smlnj/lib/c/internals
-@dirrm smlnj/lib/c/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c/CM
+@dirrm smlnj/lib/c/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/.cm
 @dirrm smlnj/lib/c
-@dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/ckit-lib.cm/CM
+@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/mlrisc-tools/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/mlrisc-tools/CM
+@dirrm smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/mlrisc-tools/.cm
 @dirrm smlnj/lib/mlrisc-tools
-@dirrm smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/pgraph-util.cm/CM
+@dirrm smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/pgraph-util.cm/.cm
 @dirrm smlnj/lib/pgraph-util.cm
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index e5518557fac7..61a422b81e50 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -15,207 +15,208 @@ smlnj/bin/ml-lex
 smlnj/bin/ml-makedepend
 smlnj/bin/ml-yacc
 smlnj/bin/sml
-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/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
-smlnj/lib/controls-lib.cm/CM/%%MLARCH%%-unix/controls-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/hash-cons-lib.cm/CM/%%MLARCH%%-unix/hash-cons-lib.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/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/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/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
+smlnj/lib/controls-lib.cm/.cm/%%MLARCH%%-unix/controls-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/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.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/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/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/MLRISC/CM/%%MLARCH%%-unix/Visual.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
+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/.cm/%%MLARCH%%-unix/installer.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/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/%%MLARCH%%-unix
-@dirrm smlnj/lib/SMLNJ-MLRISC/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/basis.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/burg-ext.cm/CM
+@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/cml/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/cml/CM
+@dirrm smlnj/lib/cml/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/cml/.cm
 @dirrm smlnj/lib/cml
-@dirrm smlnj/lib/cml-lib/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/cml-lib/CM
+@dirrm smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/cml-lib/.cm
 @dirrm smlnj/lib/cml-lib
-@dirrm smlnj/lib/controls-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/controls-lib.cm/CM
+@dirrm smlnj/lib/controls-lib.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/controls-lib.cm/.cm
 @dirrm smlnj/lib/controls-lib.cm
-@dirrm smlnj/lib/dir-tool.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/dir-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/grm-ext.cm/CM
+@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/hash-cons-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/hash-cons-lib.cm/CM
+@dirrm smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/hash-cons-lib.cm/.cm
 @dirrm smlnj/lib/hash-cons-lib.cm
-@dirrm smlnj/lib/html-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/html-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/inet-lib.cm/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/lex-ext.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/lex-ext.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/make-tool.cm/CM
+@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/ml-yacc-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/ml-yacc-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/mlburg-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/mllex-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/mlyacc-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/noweb-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/nw-ext.cm/CM
+@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/pgraph.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/pgraph.cm/CM
+@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/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/pickle-lib.cm/.cm
 @dirrm smlnj/lib/pickle-lib.cm
-@dirrm smlnj/lib/pp-lib.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/pp-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/reactive-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/regexp-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/shell-tool.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/CM
-@dirrm smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/MLRISC/CM
+@dirrm smlnj/lib/smlnj/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/smlnj/.cm
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/cmb/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/compiler/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/init/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/internal/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj/viscomp/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj-lib.cm/CM
+@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/%%MLARCH%%-unix
-@dirrm smlnj/lib/unix-lib.cm/CM
+@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
 @dirrm smlnj