svn commit: r347412 - in head/lang/mlton: . files

Fri Mar 7 17:57:09 UTC 2014

Author: rene
Date: Fri Mar  7 17:57:07 2014
New Revision: 347412
URL: http://svnweb.freebsd.org/changeset/ports/347412
QAT: https://qat.redports.org/buildarchive/r347412/

Log:
  Bring lang/mlton back into shape.
  
  From the PR submitter:
  - Update to 20100608
  - Support amd64 natively
  - Update DISTFILES location to use Sourceforge
  - Add LICENSE_FILE
  - Ensure add-local-cross script is executable
  - Clean up old patches, replace trivial patches by REINPLACE_CMD
  - Mark SMLNJ option as broken for now.
  - Mark jobs unsafe.
  
  From myself:
  - Unexpire.
  - Add stage support
  - Add USE_GCC=any
  - Convert to USES
  - New LIB_DEPENDS format
  - Remove pre-FreeBSD 7.0 compatibility
  - Pass maintainership to submitter
  
  PR:		ports/177406
  Submitted by:	Timothy Beyer <beyert at cs.ucr.edu>
  Approved by:	previous maintainer timeout (11 months)

Deleted:
  head/lang/mlton/files/patch-..-mlton-bootstrap-lib-mlton-include-cenv.h
  head/lang/mlton/files/patch-bin-mlton_script
  head/lang/mlton/files/patch-mlton-Makefile
  head/lang/mlton/files/patch-runtime-cenv.h
  head/lang/mlton/files/patch-runtime-mingw.c
  head/lang/mlton/files/patch-runtime-mingw.h
Modified:
  head/lang/mlton/Makefile
  head/lang/mlton/distinfo
  head/lang/mlton/files/add-local-cross
  head/lang/mlton/files/patch-Makefile
  head/lang/mlton/files/patch-runtime-Makefile
  head/lang/mlton/pkg-plist

Modified: head/lang/mlton/Makefile
==============================================================================

--- head/lang/mlton/Makefile	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/Makefile	Fri Mar  7 17:57:07 2014	(r347412)
@@ -1,38 +1,39 @@
 # Created by: Stephen Weeks <sweeks at sweeks.com>
 # $FreeBSD$
 
+# Previouly maintained by Jesper Louis Andersen
+# (jesper.louis.andersen at gmail.com) and Geoffrey Mainland
+# (mainland at apeiron.net)
+#
 # Because MLton is written in SML, it needs an SML compiler to build.
 # It is easiest to use another (earlier) binary version of MLton as
 # the SML compiler.  So, this Makefile fetches and installs an
 # alread-built version of MLton, BOOT_DIST, to use for bootstrapping.
 
 PORTNAME=	mlton
-PORTVERSION=	20070826
-PORTREVISION=	10
+PORTVERSION=	20100608
 CATEGORIES=	lang
-MASTER_SITES=	http://mlton.org/pages/Download/attachments/ \
-		http://mlton.org/pages/Experimental/attachments/ \
-		http://www.tbrk.org/distfiles/
-DISTFILES=	${BOOT_DIST} ${SRC_DIST}
+MASTER_SITES=	SF http://www.tbrk.org/distfiles/
+DISTFILES=	${SRC_DIST} ${BOOT_DIST}
 EXTRACT_ONLY=	${SRC_DIST}
 
-# Other maintainer is Geoffrey Mainland (mainland at apeiron.net)
-MAINTAINER=	jesper.louis.andersen at gmail.com
+MAINTAINER=	beyert at cs.ucr.edu
 COMMENT=	Optimizing Standard ML compiler
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-BROKEN=	Does not build
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2014-02-27
+LICENSE_FILE=	doc/license/MLton-LICENSE
 
 OPTIONS_DEFINE=	SMLNJ MINGW32
 SMLNJ_DESC=	Bootstrap with SML/NJ (can take >15 hours)
 MINGW32_DESC=	Add the mingw32 target (requires wine)
 
-NO_STAGE=	yes
+MAKE_JOBS_UNSAFE=	yes
+USES=	gmake
+USE_GCC=	any
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -40,24 +41,27 @@ BUILD_DEPENDS+=	gsed:${PORTSDIR}/textpro
 		htmldoc:${PORTSDIR}/textproc/htmldoc
 USE_TEX=	latex:build
 .else
-INSTALL_TARGET=	install-no-docs
+INSTALL_TARGET=	install-no-docs remove-docs
 ALL_TARGET=	all-no-docs
 .endif
 
-SRC_DIST=	${DISTNAME}-1.src.tgz
+SRC_DIST=	${DISTNAME}.src.tgz
+
+.if ${PORT_OPTIONS:MSMLNJ}
+BROKEN=	${DISTNAME}-${PORTVERSION} does not bootstrap properly with sml-nj
+.endif
 
 .if ${PORT_OPTIONS:MSMLNJ}
 BUILD_DEPENDS+=	smlnj-devel>=110.65:${PORTSDIR}/lang/sml-nj-devel
 BOOT_DIST=
 MAKE_ENV+=	SMLNJ_DEVEL=yes
 .if ! ${PORT_OPTIONS:MDOCS}
-ALL_TARGET=	nj-mlton all-no-docs
+ALL_TARGET=	smlnj-mlton all-no-docs
 .else
-ALL_TARGET=	bootstrap-nj
+ALL_TARGET=	smlnj-mlton all
 .endif
 .else
-BOOT_DIST=	${PORTNAME}-${BOOT_VER}-1.${MACHINE_ARCH}-freebsd${OSRELMAJ}.${BOOT_SUF}
-MAKE_ENV+=	LD_LIBMAP=libgmp.so.7=libgmp.so.10
+BOOT_DIST=	${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH}-freebsd${OSRELMAJ}.${BOOT_SUF}
 .endif
 
 .if ${PORT_OPTIONS:MMINGW32}
@@ -72,34 +76,31 @@ PLIST_SUB+=	MINGW32CROSS=""
 PLIST_SUB+=	MINGW32CROSS="@comment "
 .endif
 
+# MINGW32 requires wine, which doesn't have an official amd64 port
+.if ${PORT_OPTIONS:MSMLNJ} || ${PORT_OPTIONS:MMINGW32}
 ONLY_FOR_ARCHS=	i386
-
-MAN1=		mllex.1 mlprof.1 mlton.1 mlyacc.1 mlnlffigen.1
-MANCOMPRESSED=	yes
+.else
+ONLY_FOR_ARCHS=	i386 amd64
+.endif
 
 BOOT_WRKSRC=	${WRKDIR}/mlton-bootstrap
 
-USE_GMAKE=	yes
 MAKE_ARGS=	DESTDIR='' \
 		PATH=${WRKSRC}/build/bin:${BOOT_WRKSRC}/bin:${PATH} \
 		PREFIX=${PREFIX}
 
 .if ${ARCH} == "i386"
 MLTON_ARCH=	"x86"
-.endif
-
-.if ${OSVERSION} >= 700000
-OSRELMAJ=
-.else
-OSRELMAJ=	-6
+.elif ${ARCH} == "amd64"
+MLTON_ARCH=	"x64"
 .endif
 
 BOOT_EXTRACT=	--bzip2
 BOOT_SUF=	tbz
-BOOT_VER=	20070826
 
 post-extract:
 	@${CP} ${FILESDIR}/add-local-cross ${WRKSRC}/bin/
+	@${CHMOD} 755 ${WRKSRC}/bin/add-local-cross
 .if ${PORT_OPTIONS:MSMLNJ}
 	@${CP} ${FILESDIR}/upgrade-basis.sml ${WRKSRC}/mlton/
 	@for f in `ls ${FILESDIR}/ml.* ${FILESDIR}/mlb.*`; do \
@@ -114,9 +115,33 @@ post-extract:
 .endif
 
 post-patch:
+	${REINPLACE_CMD} 's/CC := gcc -std=gnu99/CC := ${CC} -std=gnu99/g' \
+		${WRKSRC}/runtime/Makefile \
+		${BOOT_WRKSRC}/lib/mlton/sml/mlnlffi-lib/Makefile
+	${REINPLACE_CMD} 's/gcc -v/${CC} -v/g' ${WRKSRC}/runtime/util/Makefile
+	${REINPLACE_CMD} 's/CC = gcc -std=gnu99/CC = ${CC} -std=gnu99/g' ${WRKSRC}/runtime/util/Makefile
+.if ${ARCH} == "i386"
+	${REINPLACE_CMD} 's/ram-slop 0\.7/max-heap 800m/g' ${WRKSRC}/mlton/Makefile
+.else
+	${REINPLACE_CMD} 's/ram-slop 0\.7/max-heap 2g/g' ${WRKSRC}/mlton/Makefile
+.endif
+.if ! ${PORT_OPTIONS:MSMLNJ}
 	@${REINPLACE_CMD} -e \
 		"s|/usr/local/lib/mlton|${BOOT_WRKSRC}/lib/mlton|;s|/usr/local|${LOCALBASE}|" \
 		${BOOT_WRKSRC}/bin/mlton
+	@${REINPLACE_CMD} -e "s|"$$"dir/../lib/mlton|${BOOT_WRKSRC}/lib/mlton|" \
+		${BOOT_WRKSRC}/bin/mlton
+	@${REINPLACE_CMD} -e "s|"$$"dir/../lib|${BOOT_WRKSRC}/lib/mlton|" \
+		${WRKSRC}/bin/mlton-script
+.endif
+	@${REINPLACE_CMD} -e "s|no-mllex|${BOOT_WRKSRC}/bin/mllex|" \
+		${WRKSRC}/mlton/front-end/Makefile \
+		${WRKSRC}/mlyacc/Makefile
+	@${REINPLACE_CMD} -e "s|no-mlyacc|${BOOT_WRKSRC}/bin/mlyacc|" \
+		${WRKSRC}/mlton/front-end/Makefile \
+		${WRKSRC}/mlyacc/Makefile
+	@${REINPLACE_CMD} -e "s|! mlton |! ${BOOT_WRKSRC}/bin/mlton |" \
+		${WRKSRC}/bin/upgrade-basis
 	@${REINPLACE_CMD} -e \
 		"s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/runtime/Makefile \
@@ -129,10 +154,25 @@ post-patch:
 		${WRKSRC}/doc/guide/PortingMLton \
 		${WRKSRC}/doc/guide/SelfCompiling \
 		${WRKSRC}/doc/guide/Installation \
-		${WRKSRC}/regression/parse.sml \
+		${WRKSRC}/regression/parse.sml
+	@${REINPLACE_CMD} -e \
+		"s|gcc|${CC}|" \
+		${WRKSRC}/bin/add-cross \
+		${WRKSRC}/bin/regression \
+		${WRKSRC}/lib/mlnlffi-lib/Makefile \
+		${WRKSRC}/mlnlffigen/gen-cppcmd \
+		${WRKSRC}/mlnlffigen/README \
+		${BOOT_WRKSRC}/lib/mlton/sml/mlrisc-lib/c-call/test/Makefile \
+		${BOOT_WRKSRC}/lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/Makefile
+	@${REINPLACE_CMD} -e \
+		"s|'gcc'|'${CC}'|" \
+		${WRKSRC}/bin/mlton-script \
+		${BOOT_WRKSRC}/bin/mlton
+.if ! ${PORT_OPTIONS:MSMLNJ}
+	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${BOOT_WRKSRC}/lib/mlton/include/cenv.h
-	@${RM} \
-		${WRKSRC}/doc/guide/PortingMLton.bak \
+.endif
+	@${RM} ${WRKSRC}/doc/guide/PortingMLton.bak \
 		${WRKSRC}/doc/guide/SelfCompiling.bak \
 		${WRKSRC}/doc/guide/Installation.bak
 
@@ -142,21 +182,4 @@ post-build:
 	${WRKSRC}/bin/add-local-cross mingw32 x86 mingw
 .endif
 
-post-install:
-.for bin in mllex mlnlffigen mlprof mlton mlyacc
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/bin/${bin}	\
-		${MAN1PREFIX}/man/man1/${bin}.1.gz
-	${CHMOD} a+rx ${PREFIX}/bin/${bin}
-.endfor
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mlton
-	${FIND} ${PREFIX}/lib/mlton -type f -exec ${CHMOD} a+r {} \;
-	${FIND} ${PREFIX}/lib/mlton -type d -exec ${CHMOD} a+rx {} \;
-	${CHMOD} a+x ${PREFIX}/lib/mlton/mlton-compile
-	${CHMOD} a+x ${PREFIX}/lib/mlton/platform
-.if ${PORT_OPTIONS:MDOCS}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	${FIND} ${DOCSDIR} -type f -exec ${CHMOD} a+r {} \;
-	${FIND} ${DOCSDIR} -type d -exec ${CHMOD} a+rx {} \;
-.endif
-
 .include <bsd.port.mk>

Modified: head/lang/mlton/distinfo
==============================================================================
--- head/lang/mlton/distinfo	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/distinfo	Fri Mar  7 17:57:07 2014	(r347412)
@@ -1,6 +1,6 @@
-SHA256 (mlton-20070826-1.i386-freebsd-6.tbz) = 515d7c11892793e330effce8c4e02467bbfb870671d91ef544b3644003709bea
-SIZE (mlton-20070826-1.i386-freebsd-6.tbz) = 7120924
-SHA256 (mlton-20070826-1.i386-freebsd.tbz) = b953da050a725d79c0445896cd6892d266f340622c52824d7f06bf8a4aed34cf
-SIZE (mlton-20070826-1.i386-freebsd.tbz) = 7006769
-SHA256 (mlton-20070826-1.src.tgz) = c2f7e07523294d070682399377ea83ed11f2ed59d142b30fc7032c1c8fd9e103
-SIZE (mlton-20070826-1.src.tgz) = 5585773
+SHA256 (mlton-20100608.src.tgz) = f2cb2cf0d6ca8e00331b15e3d23ede05080742895e79e73d2c26a546cd1c0b33
+SIZE (mlton-20100608.src.tgz) = 5785771
+SHA256 (mlton-20100608-1.i386-freebsd.tbz) = 0bf9aee4387dff75540850ab1a77b46b0ddd4687775cc56a9deab00ee3fb3042
+SIZE (mlton-20100608-1.i386-freebsd.tbz) = 10711528
+SHA256 (mlton-20100608-1.amd64-freebsd.tbz) = 1a0721c596a75c27ed4430149a62b9f497d3a8af3f189e36982ef73cd1d61d5d
+SIZE (mlton-20100608-1.amd64-freebsd.tbz) = 11935047

Modified: head/lang/mlton/files/add-local-cross
==============================================================================
--- head/lang/mlton/files/add-local-cross	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/files/add-local-cross	Fri Mar  7 17:57:07 2014	(r347412)
@@ -101,24 +101,19 @@ $MAKE -C runtime COMPILE_FAST=yes OMIT_B
 echo "* Running make dirs runtime in $tmp."
 $MAKE TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS dirs runtime
 
-echo "* Copy from tmp to build (build/lib/$crossTarget)."
+echo "* Copy from tmp to build (build/lib/targets/$crossTarget)."
 # ssh $machine "cd $tmp/build/lib/self && tar cf - ." | 
 #         ( cd "$lib/$crossTarget" && tar xf - )
-cp -pfR "$tmp/build/lib/$crossTarget" "$lib/"
+mkdir -p "$lib/targets"
+cp -pfR "$tmp/build/lib/targets/$crossTarget" "$lib/targets/"
 
-echo "* Copy from $crossArch-$crossOS (basis-library/config/c/$crossArch-crossOS)."
-#ssh $machine "cd $tmp/basis-library/config/c && tar cf - $crossArch-$crossOS" | 
-#        ( cd "$lib/sml/basis/config/c" && tar xf - )
-cp -pfR "$tmp/basis-library/config/c/$crossArch-$crossOS" \
-	"$lib/sml/basis/config/c/"
-
-echo "* Running make mlbpathmap targetmap in $src."
+echo "* Running make mlbpathmap in $src."
 #( cd "$src" &&
 #        mmake TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS \
 #                mlbpathmap targetmap )
 cd "$src"
 $MAKE TARGET=$crossTarget TARGET_ARCH=$crossArch TARGET_OS=$crossOS  \
-      mlbpathmap targetmap
+      mlbpathmap
 
 case "$crossOS" in
 mingw)
@@ -191,7 +186,6 @@ cd "$tmp/runtime/"
 $GCC $archOpts $osOpts -I. -o $exe $exe.c libmlton.a libgdtoa.a -lgmp -lm $libs
 
 #ssh $machine "$tmp/runtime/$exe$suf" >"$lib/$crossTarget/constants"
-$RUN "$tmp/runtime/$exe$suf" > "$lib/$crossTarget/constants"
+$RUN "$tmp/runtime/$exe$suf" > "$lib/targets/$crossTarget/constants"
 #ssh $machine "rm -rf $tmp"
 # rm -rf "$tmp"
-

Modified: head/lang/mlton/files/patch-Makefile
==============================================================================
--- head/lang/mlton/files/patch-Makefile	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/files/patch-Makefile	Fri Mar  7 17:57:07 2014	(r347412)
@@ -1,5 +1,5 @@
---- Makefile.orig	2007-08-27 07:04:14.000000000 +1000
-+++ Makefile	2008-04-28 10:23:28.000000000 +1000
+--- Makefile.orig	2010-06-11 06:35:30.000000000 -0700
++++ Makefile	2013-03-25 20:23:46.000000000 -0700
 @@ -34,7 +34,11 @@
  PATH := $(BIN):$(SRC)/bin:$(shell echo $$PATH)
  CP := /bin/cp -fpR
@@ -12,11 +12,14 @@
  
  # If we're compiling with another version of MLton, then we want to do
  # another round of compilation so that we get a MLton built without
-@@ -410,6 +414,7 @@
- install-no-docs:
- 	mkdir -p "$(TLIB)" "$(TBIN)" "$(TMAN)"
- 	$(CP) "$(LIB)/." "$(TLIB)/"
-+	-rm "$(TLIB)/mlton.x86-bsd"
- 	sed "/^lib=/s;.*;lib='$(prefix)/$(ULIB)';" 			\
- 		<"$(BIN)/mlton" >"$(TBIN)/mlton"
- 	chmod a+x "$(TBIN)/mlton"
+@@ -401,6 +405,10 @@
+ 	cd "$(TLIB)/sml"; for i in */[Dd]oc; do mv "$$i" "$(TDOC)/$$i"; done
+ 	cd "$(TLIB)/sml"; for i in */README*; do mv "$$i" "$(TDOC)/$$i"; done
+ 
++remove-docs:
++	cd "$(TLIB)/sml"; for i in */[Dd]oc; do rm -rf "$$i"; done
++	cd "$(TLIB)/sml"; for i in */README*; do rm -rf "$$i"; done
++
+ .PHONY: release
+ release: version
+ 	tar cvzf ../mlton-$(VERSION).tar.gz \

Modified: head/lang/mlton/files/patch-runtime-Makefile
==============================================================================
--- head/lang/mlton/files/patch-runtime-Makefile	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/files/patch-runtime-Makefile	Fri Mar  7 17:57:07 2014	(r347412)
@@ -1,7 +1,7 @@
---- runtime/Makefile.orig	2007-08-27 07:03:54.000000000 +1000
-+++ runtime/Makefile		2008-04-28 10:19:06.000000000 +1000
-@@ -11,11 +11,24 @@
- TARGET := self
+--- runtime/Makefile.orig	2010-06-11 06:35:14.000000000 -0700
++++ runtime/Makefile	2013-03-06 19:55:56.000000000 -0800
+@@ -23,6 +23,19 @@
+ 
  TARGET_ARCH := $(shell ../bin/host-arch)
  TARGET_OS := $(shell ../bin/host-os)
 +
@@ -18,67 +18,50 @@
 +endif
 +
  GCC_MAJOR_VERSION :=						\
--	$(shell gcc -v 2>&1 | grep 'gcc version' | 		\
-+	$(shell $(GCC) -v 2>&1 | grep 'gcc version' | 		\
+ 	$(shell $(CC) -v 2>&1 | grep 'gcc version' | 		\
  		sed 's/.*gcc version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/')
- GCC_MINOR_VERSION :=						\
--	$(shell gcc -v 2>&1 | grep 'gcc version' | 		\
-+	$(shell $(GCC) -v 2>&1 | grep 'gcc version' | 		\
- 		sed 's/.*gcc version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/')
- GCC_VERSION := $(GCC_MAJOR_VERSION).$(GCC_MINOR_VERSION)
- 
-@@ -96,10 +109,9 @@
- else
- AR := $(TARGET)-ar rc
- RANLIB := $(TARGET)-ranlib
--FLAGS += -b $(TARGET)
- endif
- 
--CC := gcc -std=gnu99
-+CC := $(GCC) -std=gnu99
- CPPFLAGS :=
- CFLAGS := -I. -Iplatform $(FLAGS)
- OPTCFLAGS := $(CFLAGS) $(CPPFLAGS) $(OPTFLAGS)
-@@ -247,7 +259,7 @@
- 	cd gdtoa && $(CC) -o arithchk.out arithchk.c
+@@ -292,7 +305,7 @@
+ 	cd gdtoa && $(CC) $(OPTCFLAGS) $(OPTWARNCFLAGS) -w -O1 -o arithchk.out arithchk.c
  
  gdtoa/arith.h: gdtoa/arithchk.out
 -	cd gdtoa && ./arithchk.out >arith.h
 +	cd gdtoa && $(RUN) ./arithchk.out >arith.h
  
- libmlton.a: $(OBJS)
- 	$(AR) libmlton.a $(OBJS)
-@@ -265,7 +277,7 @@
- gen/c-types.h gen/c-types.sml gen/ml-types.h: gen/gen-types.c util.h util.o
+ gdtoa/%-pic.o: gdtoa/%.c gdtoa/arith.h
+ 	$(CC) $(PICCFLAGS) $(PICWARNCFLAGS) -w -DINFNAN_CHECK -c -o $@ $<
+@@ -322,7 +335,7 @@
+ gen/gen-types.stamp: gen/gen-types.c util.h util.o
  	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-types gen/gen-types.c util.o
- 	rm -f gen/c-types.h gen/c-types.sml gen/ml-types.h
+ 	rm -f gen/c-types.h gen/c-types.sml gen/ml-types.h gen/gen-types.stamp
 -	cd gen && ./gen-types
 +	cd gen && $(RUN) ./gen-types
- 	rm -f gen/gen-types$(EXE)
+ 	rm -f gen/gen-types$(EXE) gen/gen-types
+ 	touch $@
  
- c-types.h ml-types.h: gen/c-types.h gen/ml-types.h
-@@ -276,7 +288,7 @@
- gen/basis-ffi.h gen/basis-ffi.sml: gen/gen-basis-ffi.sml gen/basis-ffi.def
+@@ -333,7 +346,7 @@
+ gen/gen-basis-ffi.stamp: gen/gen-basis-ffi.sml gen/basis-ffi.def
  	mlton -output gen/gen-basis-ffi gen/gen-basis-ffi.sml
- 	rm -f gen/basis-ffi.h gen/basis-ffi.sml
+ 	rm -f gen/basis-ffi.h gen/basis-ffi.sml gen/gen-basis-ffi.stamp
 -	cd gen && ./gen-basis-ffi
 +	cd gen && $(RUN) ./gen-basis-ffi
  	rm -f gen/gen-basis-ffi
+ 	touch $@
  
- basis-ffi.h: gen/basis-ffi.h
-@@ -286,13 +298,13 @@
- gen/sizes: gen/gen-sizes.c libmlton.a
- 	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-sizes -I. -L. -lmlton gen/gen-sizes.c util.o
+@@ -342,7 +355,7 @@
+ gen/gen-sizes.stamp: gen/gen-sizes.c libmlton.a $(HFILES)
+ 	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -I. -o gen/gen-sizes gen/gen-sizes.c -L. -lmlton
  	rm -f gen/sizes
 -	cd gen && ./gen-sizes
 +	cd gen && $(RUN) ./gen-sizes
- 	rm -f gen/gen-sizes$(EXE)
+ 	rm -f gen/gen-sizes$(EXE) gen/gen-sizes
+ 	touch $@
  
- bytecode/opcodes: bytecode/print-opcodes.c bytecode/opcode.h
+@@ -370,7 +383,7 @@
+ bytecode/print-opcodes: bytecode/print-opcodes.c bytecode/opcode.h $(HFILES)
  	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o bytecode/print-opcodes bytecode/print-opcodes.c
  	rm -f bytecode/opcodes
 -	cd bytecode && ./print-opcodes > opcodes
 +	cd bytecode && $(RUN) ./print-opcodes > opcodes
- 	rm -f bytecode/print-opcodes$(EXE)
- 
  
+ basis.c: $(BASISCFILES)
+ 	rm -f basis.c

Modified: head/lang/mlton/pkg-plist
==============================================================================
--- head/lang/mlton/pkg-plist	Fri Mar  7 17:44:14 2014	(r347411)
+++ head/lang/mlton/pkg-plist	Fri Mar  7 17:57:07 2014	(r347412)
@@ -18,6 +18,8 @@ lib/mlton/include/c-chunk.h
 lib/mlton/include/c-common.h
 lib/mlton/include/c-main.h
 lib/mlton/include/cenv.h
+lib/mlton/include/common-main.h
+lib/mlton/include/export.h
 lib/mlton/include/gc.h
 lib/mlton/include/gc/align.h
 lib/mlton/include/gc/array-allocate.h
@@ -70,8 +72,8 @@ lib/mlton/include/gc/translate.h
 lib/mlton/include/gc/weak.h
 lib/mlton/include/gc/world.h
 lib/mlton/include/interpret.h
-lib/mlton/include/main.h
 lib/mlton/include/ml-types.h
+lib/mlton/include/mlton-main.h
 lib/mlton/include/platform.h
 lib/mlton/include/platform/aix.h
 lib/mlton/include/platform/alpha.h
@@ -79,11 +81,11 @@ lib/mlton/include/platform/amd64.h
 lib/mlton/include/platform/arm.h
 lib/mlton/include/platform/cygwin.h
 lib/mlton/include/platform/darwin.h
-lib/mlton/include/platform/feround.h
 lib/mlton/include/platform/float-math.h
 lib/mlton/include/platform/freebsd.h
 lib/mlton/include/platform/hppa.h
 lib/mlton/include/platform/hpux.h
+lib/mlton/include/platform/hurd.h
 lib/mlton/include/platform/ia64.h
 lib/mlton/include/platform/linux.h
 lib/mlton/include/platform/m68k.h
@@ -92,6 +94,7 @@ lib/mlton/include/platform/mips.h
 lib/mlton/include/platform/netbsd.h
 lib/mlton/include/platform/openbsd.h
 lib/mlton/include/platform/powerpc.h
+lib/mlton/include/platform/powerpc64.h
 lib/mlton/include/platform/s390.h
 lib/mlton/include/platform/setenv.h
 lib/mlton/include/platform/solaris.h
@@ -110,20 +113,7 @@ lib/mlton/mlb-path-map
 lib/mlton/mlton-compile
 lib/mlton/opcodes
 lib/mlton/platform
-lib/mlton/self/constants
-lib/mlton/self/include/c-types.h
-lib/mlton/self/libgdtoa.a
-lib/mlton/self/libmlton-gdb.a
-lib/mlton/self/libmlton.a
-lib/mlton/self/sizes
-%%MINGW32CROSS%%lib/mlton/mingw32/constants
-%%MINGW32CROSS%%lib/mlton/mingw32/include/c-types.h
-%%MINGW32CROSS%%lib/mlton/mingw32/libgdtoa.a
-%%MINGW32CROSS%%lib/mlton/mingw32/libmlton-gdb.a
-%%MINGW32CROSS%%lib/mlton/mingw32/libmlton.a
-%%MINGW32CROSS%%lib/mlton/mingw32/sizes
 lib/mlton/sml/basis/Makefile
-lib/mlton/sml/basis/README
 lib/mlton/sml/basis/arrays-and-vectors/array-slice.sig
 lib/mlton/sml/basis/arrays-and-vectors/array.sig
 lib/mlton/sml/basis/arrays-and-vectors/array.sml
@@ -150,6 +140,8 @@ lib/mlton/sml/basis/basis-none.mlb
 lib/mlton/sml/basis/basis.mlb
 lib/mlton/sml/basis/build/sources.mlb
 lib/mlton/sml/basis/c-types.mlb
+lib/mlton/sml/basis/c/pointer.sig
+lib/mlton/sml/basis/c/pointer.sml
 lib/mlton/sml/basis/config/bind/char-prim.sml
 lib/mlton/sml/basis/config/bind/int-inf-prim.sml
 lib/mlton/sml/basis/config/bind/int-inf-top.sml
@@ -167,8 +159,6 @@ lib/mlton/sml/basis/config/c/position.sm
 lib/mlton/sml/basis/config/c/sys-types.sml
 lib/mlton/sml/basis/config/c/sys-word.sml
 lib/mlton/sml/basis/config/c/word-to-bool.sml
-lib/mlton/sml/basis/config/c/x86-freebsd/c-types.sml
-%%MINGW32CROSS%%lib/mlton/sml/basis/config/c/x86-mingw/c-types.sml
 lib/mlton/sml/basis/config/choose-char.sml
 lib/mlton/sml/basis/config/choose-int.sml
 lib/mlton/sml/basis/config/choose-real.sml
@@ -330,11 +320,6 @@ lib/mlton/sml/basis/list/list-pair.sig
 lib/mlton/sml/basis/list/list-pair.sml
 lib/mlton/sml/basis/list/list.sig
 lib/mlton/sml/basis/list/list.sml
-lib/mlton/sml/basis/maps/c-types.amd64-linux.map
-lib/mlton/sml/basis/maps/c-types.test-amd64-m32-linux.map
-lib/mlton/sml/basis/maps/c-types.test-amd64-m64-linux.map
-lib/mlton/sml/basis/maps/c-types.test-weird-weird.map
-lib/mlton/sml/basis/maps/c-types.x86-linux.map
 lib/mlton/sml/basis/maps/header-word32.map
 lib/mlton/sml/basis/maps/header-word64.map
 lib/mlton/sml/basis/maps/objptr-rep32.map
@@ -434,6 +419,7 @@ lib/mlton/sml/basis/posix/io.sig
 lib/mlton/sml/basis/posix/io.sml
 lib/mlton/sml/basis/posix/posix.sig
 lib/mlton/sml/basis/posix/posix.sml
+lib/mlton/sml/basis/posix/pre-posix.sml
 lib/mlton/sml/basis/posix/proc-env.sig
 lib/mlton/sml/basis/posix/proc-env.sml
 lib/mlton/sml/basis/posix/process.sig
@@ -524,6 +510,8 @@ lib/mlton/sml/basis/top-level/infixes.sm
 lib/mlton/sml/basis/unsafe.mlb
 lib/mlton/sml/basis/util/CUtil.sig
 lib/mlton/sml/basis/util/CUtil.sml
+lib/mlton/sml/basis/util/abs-rep.fun
+lib/mlton/sml/basis/util/abs-rep.sig
 lib/mlton/sml/basis/util/cleaner.sig
 lib/mlton/sml/basis/util/cleaner.sml
 lib/mlton/sml/basis/util/dynamic-wind.sig
@@ -540,14 +528,8 @@ lib/mlton/sml/basis/util/unique-id.fun
 lib/mlton/sml/basis/util/unique-id.sig
 lib/mlton/sml/ckit-lib/BUGS
 lib/mlton/sml/ckit-lib/HISTORY
-lib/mlton/sml/ckit-lib/README
-lib/mlton/sml/ckit-lib/README.mlton
-lib/mlton/sml/ckit-lib/README.mlton.orig
 lib/mlton/sml/ckit-lib/ckit-lib.mlb
 lib/mlton/sml/ckit-lib/ckit-lib.mlb.orig
-lib/mlton/sml/ckit-lib/doc/overview
-lib/mlton/sml/ckit-lib/doc/overview.html
-lib/mlton/sml/ckit-lib/doc/todo
 lib/mlton/sml/ckit-lib/regression/README
 lib/mlton/sml/ckit-lib/regression/invalid-programs/a208.c
 lib/mlton/sml/ckit-lib/regression/invalid-programs/a37.c
@@ -1053,11 +1035,11 @@ lib/mlton/sml/cml/util/local-debug.fun
 lib/mlton/sml/cml/util/timeit.sig
 lib/mlton/sml/cml/util/timeit.sml
 lib/mlton/sml/cml/util/util.mlb
-lib/mlton/sml/mlnlffi-lib/README
-lib/mlton/sml/mlnlffi-lib/README.mlton
+lib/mlton/sml/mlnlffi-lib/Makefile
 lib/mlton/sml/mlnlffi-lib/c-debug.sig
 lib/mlton/sml/mlnlffi-lib/c.mlb
 lib/mlton/sml/mlnlffi-lib/c.sig
+lib/mlton/sml/mlnlffi-lib/gen-rtld-flags.c
 lib/mlton/sml/mlnlffi-lib/internals/c-debug.sml
 lib/mlton/sml/mlnlffi-lib/internals/c-int.mlb
 lib/mlton/sml/mlnlffi-lib/internals/c-int.sig
@@ -1083,128 +1065,15 @@ lib/mlton/sml/mlnlffi-lib/memory/platfor
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.darwin.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.freebsd.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.hpux.mlb
+lib/mlton/sml/mlnlffi-lib/memory/platform/memory.hurd.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.linux.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.mingw.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.netbsd.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.openbsd.mlb
 lib/mlton/sml/mlnlffi-lib/memory/platform/memory.solaris.mlb
+lib/mlton/sml/mlnlffi-lib/memory/platform/rtld-flags.freebsd.sml
 lib/mlton/sml/mlnlffi-lib/mlnlffi-lib.mlb
 lib/mlton/sml/mlnlffi-lib/zstring.sig
-lib/mlton/sml/mlrisc-lib/Doc/Makefile
-lib/mlton/sml/mlrisc-lib/Doc/README
-lib/mlton/sml/mlrisc-lib/Doc/graphics/fun-ssa-value-graph.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-cdg-survey.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-cfg-survey.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-ddg.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-dom-survey.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-loop-nesting.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-opt.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-region-survey.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/mandelbrot-ssa.gif
-lib/mlton/sml/mlrisc-lib/Doc/graphics/smlnj.jpg
-lib/mlton/sml/mlrisc-lib/Doc/graphics/vh32.png
-lib/mlton/sml/mlrisc-lib/Doc/graphics/vh401.gif
-lib/mlton/sml/mlrisc-lib/Doc/html/Makefile
-lib/mlton/sml/mlrisc-lib/Doc/html/mltex.thm
-lib/mlton/sml/mlrisc-lib/Doc/html/mltex2html
-lib/mlton/sml/mlrisc-lib/Doc/html/mltex2html.orig
-lib/mlton/sml/mlrisc-lib/Doc/latex/C6.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/ILP.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/INTRO.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/Makefile
-lib/mlton/sml/mlrisc-lib/Doc/latex/SSA.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/VLIW.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/alpha.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/annotations.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/asm.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/availability.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/backend-opt.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/cells.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/cluster.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/compiler-graphs.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/constants.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/contributions.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/contributors.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/delayslots.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/freq.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/future-work.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/gc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/graphics.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/graphs.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/hppa.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/instrsel.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/instructions.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/labelexp.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/labels.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/line-counts.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/md.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mips.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-arch.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-compiler.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-gen.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-graphics.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-ir-rep.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-ir.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-md.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc-ra.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc.bib
-lib/mlton/sml/mlrisc-lib/Doc/latex/mlrisc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltex.sty
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltex.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltexdoc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltree-ext.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltree-util.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/mltree.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/optimizations.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/ppc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/problem.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/pseudo-ops.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/ra.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/regions.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/regmap.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/requirements.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/sml.sty
-lib/mlton/sml/mlrisc-lib/Doc/latex/sml.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/span-dep.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/sparc.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/streams.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/sys-integration.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/systems.tex
-lib/mlton/sml/mlrisc-lib/Doc/latex/x86.tex
-lib/mlton/sml/mlrisc-lib/Doc/pictures/Makefile
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/big-pict.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/big-pict2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/cdg.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/cfg-rev.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/cfg.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/compiler-1.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/compiler-2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/compiler.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/compiler2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/dom.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/hof-1.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/hof-2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/hyperblock-formation.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/if-conversion.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/layers.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/mlrisc-IR.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/mlrisc-ir-archive.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/optimization.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/pdom.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/phg.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/region-builder.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/sharing1.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/sharing2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/sharing3.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/subgraph.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/tail-dupl.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/tail-duplication.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/trace.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/uncol.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/uncol1.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/uncol2.fig
-lib/mlton/sml/mlrisc-lib/Doc/pictures/fig/viewer.fig
 lib/mlton/sml/mlrisc-lib/Glue/mlrisc-glue.sig
 lib/mlton/sml/mlrisc-lib/Glue/mlrisc-glue.sml
 lib/mlton/sml/mlrisc-lib/Glue/mlrisc-ssa-optimizer.sig
@@ -1238,8 +1107,6 @@ lib/mlton/sml/mlrisc-lib/IR/mlrisc-resha
 lib/mlton/sml/mlrisc-lib/IR/sources.cm
 lib/mlton/sml/mlrisc-lib/IR/static-branch-prediction.sig
 lib/mlton/sml/mlrisc-lib/IR/static-branch-prediction.sml
-lib/mlton/sml/mlrisc-lib/README.mlton
-lib/mlton/sml/mlrisc-lib/README.mlton.orig
 lib/mlton/sml/mlrisc-lib/SSA/SSA.cm
 lib/mlton/sml/mlrisc-lib/SSA/bitmap.sml
 lib/mlton/sml/mlrisc-lib/SSA/cfg2ssa.sig
@@ -1416,10 +1283,14 @@ lib/mlton/sml/mlrisc-lib/amd64/amd64.mdl
 lib/mlton/sml/mlrisc-lib/amd64/amd64.mdl.orig
 lib/mlton/sml/mlrisc-lib/amd64/amd64MC.sml
 lib/mlton/sml/mlrisc-lib/amd64/amd64MC.sml.orig
+lib/mlton/sml/mlrisc-lib/amd64/amd64MCFn.sml
+lib/mlton/sml/mlrisc-lib/amd64/amd64MCFn.sml.orig
 lib/mlton/sml/mlrisc-lib/amd64/backpatch/amd64Jumps.sml
 lib/mlton/sml/mlrisc-lib/amd64/backpatch/amd64Jumps.sml.orig
 lib/mlton/sml/mlrisc-lib/amd64/emit/amd64Asm.sml
 lib/mlton/sml/mlrisc-lib/amd64/emit/amd64Asm.sml.orig
+lib/mlton/sml/mlrisc-lib/amd64/flowgraph/amd64-darwin-pseudo-ops.sml
+lib/mlton/sml/mlrisc-lib/amd64/flowgraph/amd64-darwin-pseudo-ops.sml.orig
 lib/mlton/sml/mlrisc-lib/amd64/flowgraph/amd64GasPseudoOps.sml
 lib/mlton/sml/mlrisc-lib/amd64/flowgraph/amd64GasPseudoOps.sml.orig
 lib/mlton/sml/mlrisc-lib/amd64/instructions/amd64Cells.sml
@@ -1442,9 +1313,6 @@ lib/mlton/sml/mlrisc-lib/amd64/ra/amd64R
 lib/mlton/sml/mlrisc-lib/amd64/ra/amd64RegAlloc.sml.orig
 lib/mlton/sml/mlrisc-lib/amd64/ra/amd64SpillInstr.sml
 lib/mlton/sml/mlrisc-lib/amd64/ra/amd64SpillInstr.sml.orig
-lib/mlton/sml/mlrisc-lib/amd64/staged-allocation/amd64-svid.sml
-lib/mlton/sml/mlrisc-lib/amd64/staged-allocation/amd64-svid.sml.orig
-lib/mlton/sml/mlrisc-lib/amd64/staged-allocation/c-sizes.sml
 lib/mlton/sml/mlrisc-lib/autoload.sml
 lib/mlton/sml/mlrisc-lib/backpatch/backpatch.sml
 lib/mlton/sml/mlrisc-lib/backpatch/backpatch.sml.orig
@@ -1467,8 +1335,60 @@ lib/mlton/sml/mlrisc-lib/block-placement
 lib/mlton/sml/mlrisc-lib/block-placement/jump-chain-elim-fn.sml.orig
 lib/mlton/sml/mlrisc-lib/block-placement/weighted-block-placement-fn.sml
 lib/mlton/sml/mlrisc-lib/block-placement/weighted-block-placement-fn.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/README
+lib/mlton/sml/mlrisc-lib/c-call/archs/sources.cm
+lib/mlton/sml/mlrisc-lib/c-call/archs/sparc-c-call-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/sparc-c-call-fn.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/archs/sparc-c-sizes.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/sparc-c-sizes.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-64-c-sizes.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-64-svid-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-64-svid-fn.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-c-sizes.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-svid-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/archs/x86-svid-fn.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-call-gen-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-call-gen-fn.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-call-gen-sig.sml
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-call-sig.sml
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-call-sig.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-type.sml
+lib/mlton/sml/mlrisc-lib/c-call/gen/c-type.sml.orig
+lib/mlton/sml/mlrisc-lib/c-call/test/Makefile
+lib/mlton/sml/mlrisc-lib/c-call/test/c-sparc-test.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/c-test-gen.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/c-x86-64-test.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/c-x86-test.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/group.cm
+lib/mlton/sml/mlrisc-lib/c-call/test/sources.cm
+lib/mlton/sml/mlrisc-lib/c-call/test/spill-table.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/test-varargs.sml
+lib/mlton/sml/mlrisc-lib/c-call/test/wrapper.cm
+lib/mlton/sml/mlrisc-lib/c-call/test/x86-64-elf.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/located-arg-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/marshal.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/smlnj-prim-c-call.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/sources.cm
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/vararg-call-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/vararg-call.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/vararg-constants.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/call/vararg.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/Makefile
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/gen-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/located-arg.h
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/mlrisc-gen-sig.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/sparc-gen-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/test-interp.c
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/test.c
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/util.c
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/vararg-interp-sparc.s
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/vararg-interp-x86-darwin.s
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/vararg-interp-x86-linux.s
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/x86-64-gen-fn.sml
+lib/mlton/sml/mlrisc-lib/c-call/varargs/interp/x86-gen-fn.sml
 lib/mlton/sml/mlrisc-lib/c-calls/c-calls.sig
 lib/mlton/sml/mlrisc-lib/c-calls/c-types.sml
+lib/mlton/sml/mlrisc-lib/c-calls/c-types.sml.orig
 lib/mlton/sml/mlrisc-lib/c-calls/unimplemented-c-calls.sml
 lib/mlton/sml/mlrisc-lib/c-calls/unimplemented-c-calls.sml.orig
 lib/mlton/sml/mlrisc-lib/cluster/clusterGraph.sig
@@ -1488,6 +1408,13 @@ lib/mlton/sml/mlrisc-lib/cm/AMD64-RTL.cm
 lib/mlton/sml/mlrisc-lib/cm/AMD64-SSA.cm
 lib/mlton/sml/mlrisc-lib/cm/AMD64-Sched.cm
 lib/mlton/sml/mlrisc-lib/cm/AMD64.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-Vararg.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-VarargCall.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-VarargInterp.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-sparc.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-x86-64.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall-x86.cm
+lib/mlton/sml/mlrisc-lib/cm/CCall.cm
 lib/mlton/sml/mlrisc-lib/cm/Control.cm
 lib/mlton/sml/mlrisc-lib/cm/GC.cm
 lib/mlton/sml/mlrisc-lib/cm/Graphs.cm
@@ -1515,7 +1442,6 @@ lib/mlton/sml/mlrisc-lib/cm/Peephole.cm
 lib/mlton/sml/mlrisc-lib/cm/RA.cm
 lib/mlton/sml/mlrisc-lib/cm/RTL.cm
 lib/mlton/sml/mlrisc-lib/cm/Region.cm
-lib/mlton/sml/mlrisc-lib/cm/SA.cm
 lib/mlton/sml/mlrisc-lib/cm/SPARC-GC.cm
 lib/mlton/sml/mlrisc-lib/cm/SPARC-Peephole.cm
 lib/mlton/sml/mlrisc-lib/cm/SPARC-RTL.cm
@@ -1524,6 +1450,7 @@ lib/mlton/sml/mlrisc-lib/cm/SPARC-Sched.
 lib/mlton/sml/mlrisc-lib/cm/SPARC.cm
 lib/mlton/sml/mlrisc-lib/cm/SSA.cm
 lib/mlton/sml/mlrisc-lib/cm/Sched.cm
+lib/mlton/sml/mlrisc-lib/cm/StagedAlloc.cm
 lib/mlton/sml/mlrisc-lib/cm/VLIW.cm
 lib/mlton/sml/mlrisc-lib/cm/Visual.cm
 lib/mlton/sml/mlrisc-lib/cm/ir-archive.cm
@@ -1539,13 +1466,18 @@ lib/mlton/sml/mlrisc-lib/demo/build-110.
 lib/mlton/sml/mlrisc-lib/demo/build-110.25.sml
 lib/mlton/sml/mlrisc-lib/demo/build-110.29.sml
 lib/mlton/sml/mlrisc-lib/demo/demo-alpha.sml
+lib/mlton/sml/mlrisc-lib/demo/demo-amd64.sml
 lib/mlton/sml/mlrisc-lib/demo/demo-backend.sml
 lib/mlton/sml/mlrisc-lib/demo/demo-sparc.sml
 lib/mlton/sml/mlrisc-lib/demo/demo-types.sml
 lib/mlton/sml/mlrisc-lib/demo/eg-alpha.sml
+lib/mlton/sml/mlrisc-lib/demo/eg-amd64.sml
 lib/mlton/sml/mlrisc-lib/demo/eg-sparc.sml
+lib/mlton/sml/mlrisc-lib/demo/group.cm
+lib/mlton/sml/mlrisc-lib/demo/sources-amd64.cm
 lib/mlton/sml/mlrisc-lib/demo/sources.cm
 lib/mlton/sml/mlrisc-lib/demo/spill-table.sml
+lib/mlton/sml/mlrisc-lib/demo/wrapper.cm
 lib/mlton/sml/mlrisc-lib/emit/asm-flags.sml
 lib/mlton/sml/mlrisc-lib/emit/asmEmit.sig
 lib/mlton/sml/mlrisc-lib/emit/asmStream.sml
@@ -1870,6 +1802,14 @@ lib/mlton/sml/mlrisc-lib/mlb/AMD64-Peeph
 lib/mlton/sml/mlrisc-lib/mlb/AMD64-Peephole.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/AMD64.mlb
 lib/mlton/sml/mlrisc-lib/mlb/AMD64.mlb.orig
+lib/mlton/sml/mlrisc-lib/mlb/CCall-sparc.mlb
+lib/mlton/sml/mlrisc-lib/mlb/CCall-sparc.mlb.orig
+lib/mlton/sml/mlrisc-lib/mlb/CCall-x86-64.mlb
+lib/mlton/sml/mlrisc-lib/mlb/CCall-x86-64.mlb.orig
+lib/mlton/sml/mlrisc-lib/mlb/CCall-x86.mlb
+lib/mlton/sml/mlrisc-lib/mlb/CCall-x86.mlb.orig
+lib/mlton/sml/mlrisc-lib/mlb/CCall.mlb
+lib/mlton/sml/mlrisc-lib/mlb/CCall.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/Control.mlb
 lib/mlton/sml/mlrisc-lib/mlb/Control.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/Graphs.mlb
@@ -1892,10 +1832,10 @@ lib/mlton/sml/mlrisc-lib/mlb/Peephole.ml
 lib/mlton/sml/mlrisc-lib/mlb/Peephole.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/RA.mlb
 lib/mlton/sml/mlrisc-lib/mlb/RA.mlb.orig
-lib/mlton/sml/mlrisc-lib/mlb/SA.mlb
-lib/mlton/sml/mlrisc-lib/mlb/SA.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/SPARC.mlb
 lib/mlton/sml/mlrisc-lib/mlb/SPARC.mlb.orig
+lib/mlton/sml/mlrisc-lib/mlb/StagedAlloc.mlb
+lib/mlton/sml/mlrisc-lib/mlb/StagedAlloc.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlb/Visual.mlb
 lib/mlton/sml/mlrisc-lib/mlb/Visual.mlb.orig
 lib/mlton/sml/mlrisc-lib/mlrisc-lib.mlb
@@ -1910,6 +1850,8 @@ lib/mlton/sml/mlrisc-lib/mltree/machine-
 lib/mlton/sml/mlrisc-lib/mltree/machine-int.sml
 lib/mlton/sml/mlrisc-lib/mltree/mltree-basis.sig
 lib/mlton/sml/mlrisc-lib/mltree/mltree-basis.sml
+lib/mlton/sml/mlrisc-lib/mltree/mltree-check-ty.sml
+lib/mlton/sml/mlrisc-lib/mltree/mltree-check-ty.sml.orig
 lib/mlton/sml/mlrisc-lib/mltree/mltree-eval.sig
 lib/mlton/sml/mlrisc-lib/mltree/mltree-eval.sml
 lib/mlton/sml/mlrisc-lib/mltree/mltree-extension.sig
@@ -2113,11 +2055,14 @@ lib/mlton/sml/mlrisc-lib/sparc/ra/sparcR
 lib/mlton/sml/mlrisc-lib/sparc/ra/sparcRewrite.sml
 lib/mlton/sml/mlrisc-lib/sparc/ra/sparcSpillInstr.sml
 lib/mlton/sml/mlrisc-lib/sparc/sparc.mdl
-lib/mlton/sml/mlrisc-lib/staged-allocation/c-call-sig.sml
-lib/mlton/sml/mlrisc-lib/staged-allocation/call-conv-sig.sml
-lib/mlton/sml/mlrisc-lib/staged-allocation/staged-allocation-fn.sml
-lib/mlton/sml/mlrisc-lib/staged-allocation/staged-allocation-fn.sml.orig
-lib/mlton/sml/mlrisc-lib/staged-allocation/staged-allocation-sig.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/README
+lib/mlton/sml/mlrisc-lib/staged-alloc/allocator/staged-allocation-fn.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/allocator/staged-allocation-sig.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/conventions/c-loc-kind.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/conventions/power-pc-fn.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/conventions/sparc-c-fn.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/conventions/x86-64-c-fn.sml
+lib/mlton/sml/mlrisc-lib/staged-alloc/conventions/x86-c-fn.sml
 lib/mlton/sml/mlrisc-lib/visualization/allDisplays.sml
 lib/mlton/sml/mlrisc-lib/visualization/cfgViewer.sml
 lib/mlton/sml/mlrisc-lib/visualization/cfgViewer.sml.orig
@@ -2183,10 +2128,10 @@ lib/mlton/sml/mlrisc-lib/x86/x86MC.sml.o
 lib/mlton/sml/mlyacc-lib/base.sig
 lib/mlton/sml/mlyacc-lib/join.sml
 lib/mlton/sml/mlyacc-lib/lrtable.sml
+lib/mlton/sml/mlyacc-lib/ml-yacc-lib.cm
 lib/mlton/sml/mlyacc-lib/mlyacc-lib.mlb
 lib/mlton/sml/mlyacc-lib/parser1.sml
 lib/mlton/sml/mlyacc-lib/parser2.sml
-lib/mlton/sml/mlyacc-lib/sources.cm
 lib/mlton/sml/mlyacc-lib/stream.sml
 lib/mlton/sml/smlnj-lib/CHANGES
 lib/mlton/sml/smlnj-lib/CPP/README
@@ -2203,66 +2148,6 @@ lib/mlton/sml/smlnj-lib/Controls/control
 lib/mlton/sml/smlnj-lib/Controls/controls.sml
 lib/mlton/sml/smlnj-lib/Controls/registry-sig.sml
 lib/mlton/sml/smlnj-lib/Controls/registry.sml
-lib/mlton/sml/smlnj-lib/Doc/BasisInfo/HTML.info
-lib/mlton/sml/smlnj-lib/Doc/CATALOG
-lib/mlton/sml/smlnj-lib/Doc/Config.cfg
-lib/mlton/sml/smlnj-lib/Doc/Entities.sgml
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Controls/control-registry.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Controls/control-set.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Controls/control-util.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Controls/controls-lib-part.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Controls/controls.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/HashCons/hash-cons.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/engine-sig.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/match-tree.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/parser-sig.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/regexp-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/regexp-intro.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/regexp-lib-part.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/regexp-sig.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/RegExp/syntax.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Unix/unix-env.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Unix/unix-lib-part.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Unix/unix-path.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/array-qsort-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/array-qsort.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/array-sort.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/atom.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/binary-map-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/binary-set-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/bit-array.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/bit-vector.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/bsearch.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/char-map.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/dynamic-array.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/fifo.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/iterate.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/lib-base.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/list-format.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/list-map-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/list-set-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/list-xprod.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/listsort.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/mono-array-sort.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/mono-dynamic-array.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/ord-key.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/ord-map.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/ord-set.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/queue.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/rand.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/random.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/splay-map-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/splay-set-fn.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/splaytree.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/uref.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/Util/util-lib-part.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/intro-part.mldoc
-lib/mlton/sml/smlnj-lib/Doc/ML-Doc/smlnj-lib.mldoc
-lib/mlton/sml/smlnj-lib/Doc/config.sh
-lib/mlton/sml/smlnj-lib/Doc/index.template
-lib/mlton/sml/smlnj-lib/Doc/input
-lib/mlton/sml/smlnj-lib/Doc/page.template
-lib/mlton/sml/smlnj-lib/Doc/toc.template
 lib/mlton/sml/smlnj-lib/HTML/HTML32.dtd
 lib/mlton/sml/smlnj-lib/HTML/README
 lib/mlton/sml/smlnj-lib/HTML/check-html-fn.sml
@@ -2270,8 +2155,6 @@ lib/mlton/sml/smlnj-lib/HTML/html-attr-v
 lib/mlton/sml/smlnj-lib/HTML/html-attrs-fn.sml
 lib/mlton/sml/smlnj-lib/HTML/html-attrs-fn.sml.orig
 lib/mlton/sml/smlnj-lib/HTML/html-attrs-sig.sml
-lib/mlton/sml/smlnj-lib/HTML/html-cons-lib.mlb
-lib/mlton/sml/smlnj-lib/HTML/html-cons-lib.mlb.orig
 lib/mlton/sml/smlnj-lib/HTML/html-defaults.sml
 lib/mlton/sml/smlnj-lib/HTML/html-elements-fn.sml
 lib/mlton/sml/smlnj-lib/HTML/html-elements-fn.sml.orig
@@ -2314,6 +2197,18 @@ lib/mlton/sml/smlnj-lib/INet/inet-lib.ml
 lib/mlton/sml/smlnj-lib/INet/sock-util-sig.sml
 lib/mlton/sml/smlnj-lib/INet/sock-util.sml
 lib/mlton/sml/smlnj-lib/INet/unix-sock-util.sml
+lib/mlton/sml/smlnj-lib/JSON/README
+lib/mlton/sml/smlnj-lib/JSON/json-lib.cm
+lib/mlton/sml/smlnj-lib/JSON/json-lib.mlb
+lib/mlton/sml/smlnj-lib/JSON/json-lib.mlb.orig
+lib/mlton/sml/smlnj-lib/JSON/json-parser.sml
+lib/mlton/sml/smlnj-lib/JSON/json-printer.sml
+lib/mlton/sml/smlnj-lib/JSON/json-stream-parser.sml
+lib/mlton/sml/smlnj-lib/JSON/json-stream-printer.sml
+lib/mlton/sml/smlnj-lib/JSON/json-tokens.sml
+lib/mlton/sml/smlnj-lib/JSON/json.lex
+lib/mlton/sml/smlnj-lib/JSON/json.lex.sml
+lib/mlton/sml/smlnj-lib/JSON/json.sml
 lib/mlton/sml/smlnj-lib/PORTING
 lib/mlton/sml/smlnj-lib/PP/README
 lib/mlton/sml/smlnj-lib/PP/devices/ansi-term-dev.sml
@@ -2342,9 +2237,6 @@ lib/mlton/sml/smlnj-lib/PP/tests/sources
 lib/mlton/sml/smlnj-lib/PP/tests/test-html.sml
 lib/mlton/sml/smlnj-lib/PP/tests/test.sml
 lib/mlton/sml/smlnj-lib/PP/tests/typp.sml
-lib/mlton/sml/smlnj-lib/README
-lib/mlton/sml/smlnj-lib/README.mlton
-lib/mlton/sml/smlnj-lib/README.mlton.orig
 lib/mlton/sml/smlnj-lib/Reactive/README
 lib/mlton/sml/smlnj-lib/Reactive/instruction.sml
 lib/mlton/sml/smlnj-lib/Reactive/machine.sml
@@ -2357,6 +2249,7 @@ lib/mlton/sml/smlnj-lib/RegExp/BackEnd/b

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
