diff -ruN mlton.orig/Makefile mlton/Makefile
--- mlton.orig/Makefile	2010-06-01 14:31:55.000000000 +0000
+++ mlton/Makefile	2010-06-01 15:16:45.000000000 +0000
@@ -16,7 +16,7 @@
 CATEGORIES=	lang
 MASTER_SITES=	http://mlton.org/pages/Download/attachments/ \
 		http://mlton.org/pages/Experimental/attachments/ \
-		http://www.cse.unsw.edu.au/~tbourke/distfiles/
+		http://www.tbrk.org/distfiles/
 DISTFILES=	${BOOT_DIST} ${SRC_DIST}
 EXTRACT_ONLY=	${SRC_DIST}
 
@@ -28,10 +28,6 @@
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-BROKEN=		does not build
-DEPRECATED=	has been broken for 5 months
-EXPIRATION_DATE=2010-01-08
-
 OPTIONS=	SMLNJ	"Bootstrap with SML/NJ (can take >15 hours)"	off \
 		MINGW32	"Add the mingw32 target (requires wine)"	off
 
@@ -41,6 +37,9 @@
 BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed \
 		htmldoc:${PORTSDIR}/textproc/htmldoc \
 		latex:${PORTSDIR}/print/teTeX
+.else
+INSTALL_TARGET=	install-no-docs
+ALL_TARGET=	all-no-docs
 .endif
 
 SRC_DIST=	${DISTNAME}-1.src.tgz
@@ -49,17 +48,22 @@
 BUILD_DEPENDS+=	smlnj-devel>=110.65:${PORTSDIR}/lang/sml-nj-devel
 BOOT_DIST=
 MAKE_ENV+=	SMLNJ_DEVEL=yes
+.if defined(NOPORTDOCS)
+ALL_TARGET=	nj-mlton all-no-docs
+.else
 ALL_TARGET=	bootstrap-nj
+.endif
 .else
 BOOT_DIST=	${PORTNAME}-${BOOT_VER}-1.${MACHINE_ARCH}-freebsd${OSRELMAJ}.${BOOT_SUF}
+MAKE_ENV+=	LD_LIBMAP=libgmp.so.7=libgmp.so.10
 .endif
 
 .if defined(WITH_MINGW32)
 BUILD_DEPENDS+=	wine:${PORTSDIR}/emulators/wine \
 		mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \
-		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/devel/mingw32-libgmp4
+		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp4
 RUN_DEPENDS+=	mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \
-		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/devel/mingw32-libgmp4
+		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp4
 
 PLIST_SUB+=	MINGW32CROSS=""
 .else
@@ -78,10 +82,6 @@
 		PATH=${WRKSRC}/build/bin:${BOOT_WRKSRC}/bin:${PATH} \
 		PREFIX=${PREFIX}
 
-.if defined(NOPORTDOCS)
-INSTALL_TARGET=	install-no-docs
-.endif
-
 .if ${ARCH} == "i386"
 MLTON_ARCH=	"x86"
 .endif