30 files changed, 132 insertions, 764 deletions

diff --git a/lang/Makefile b/lang/Makefile
index eae4a224d6f2..39e8be324803 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -176,8 +176,8 @@
     SUBDIR += modula3
     SUBDIR += mono
     SUBDIR += mono-basic
-    SUBDIR += moscow_ml
     SUBDIR += mosh
+    SUBDIR += mosml
     SUBDIR += mtasc
     SUBDIR += munger
     SUBDIR += nawk
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
deleted file mode 100644
index 2dbfc5eb005d..000000000000
--- a/lang/moscow_ml/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# Created by: Chuck Robey <chuckr@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	moscow_ml
-PORTVERSION=	2.01
-PORTREVISION=	7
-CATEGORIES=	lang
-MASTER_SITES=	http://www.itu.dk/~sestoft/mosml/
-DISTNAME=	mos201src
-
-MAINTAINER=	johans@FreeBSD.org
-COMMENT=	Lightweight implementation of Standard ML
-
-BROKEN_powerpc64=	Does not build
-
-LIB_DEPENDS=	libgmp.so:math/gmp \
-		libgdbm.so:databases/gdbm
-
-RESTRICTED=	Restrictions on for-profit distribution
-
-USES=		compiler:features perl5
-ALL_TARGET=	world
-MAKE_ARGS=	MOSMLHOME="${MOSMLHOME}" DOCSDIR="${DOCSDIR}" \
-		LD_RUN_PATH="${PREFIX}/lib/mosml"
-WRKSRC=		${WRKDIR}/mosml/src
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-.include <bsd.port.pre.mk>
-
-post-patch: .SILENT
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
-	${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
-		${REINPLACE_CMD} -e "s,-fno-defer-pop,,"
-.endif
-	${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
-		${REINPLACE_CMD} -e "s,-O2,${CFLAGS} -I${LOCALBASE}/include,"
-	${FIND} ${WRKDIR}/mosml/examples -name Makefile -o \
-		-name Makefile.stub | ${XARGS} ${REINPLACE_CMD} \
-		-e "s,^MOSMLHOME=.*,,"
-	${FIND} ${WRKDIR}/mosml/examples -name Makefile -o \
-		-name Makefile.stub | ${XARGS} ${REINPLACE_CMD} -e \
-		"s,^MOSMLTOOLS=.*,MOSMLTOOLS=camlrunm ${PREFIX}/libexec/mosml,"
-	@${MKDIR} ${WRKDIR}/mosml/examples/ffi
-	${LN} -s ${WRKSRC}/dynlibs/crypt ${WRKDIR}/mosml/examples/ffi
-	${LN} -s ${WRKSRC}/dynlibs/interface ${WRKDIR}/mosml/examples/ffi
-	${REINPLACE_CMD} -e "s,/usr/local,${PREFIX}," \
-		${WRKSRC}/dynlibs/crypt/Makefile \
-		${WRKSRC}/dynlibs/interface/Makefile
-	${REINPLACE_CMD} -e '/ln -s/s|$$(BINDIR)|../../bin|' \
-		${WRKSRC}/mosmllib/Makefile
-# Fix inner makefiles and configure script to make port jobs (-jX) safe
-	${REINPLACE_CMD} -e '2s,^,cd "$$1" || exit 1 ; shift,' \
-		${WRKSRC}/config/autoconf
-	${REINPLACE_CMD} -E 's,cd( config); sh (autoconf),sh\1/\2\1,' \
-		${WRKSRC}/Makefile
-	${FIND} ${WRKSRC} -type f -name Makefile -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -E 's|cd (.+); make|$$(MAKE) -C \1|'
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/mosml/copyrght/copyrght.att \
-		${WRKDIR}/mosml/copyrght/copyrght.cl \
-		${WRKDIR}/mosml/copyrght/gpl2 \
-		${WRKDIR}/mosml/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README.FreeBSD
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/mosml/tools/Makefile.stub ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR}/mosml/examples && ${TAR} -cf - --dereference \
-		--exclude=\*.orig --exclude=\*.bak --exclude=\*.w32 * | \
-		${TAR} -xf - -C "${STAGEDIR}${EXAMPLESDIR}"
-	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
-	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
-		${STAGEDIR}${PREFIX}/lib/mosml/header
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mosml/lib*.so
-
-.include <bsd.port.post.mk>
diff --git a/lang/moscow_ml/distinfo b/lang/moscow_ml/distinfo
deleted file mode 100644
index ca29c614df5c..000000000000
--- a/lang/moscow_ml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mos201src.tar.gz) = 9ec5695358a4aa4702d856c026f3cf0bce77275e8d1318fd90d455a44c46edff
-SIZE (mos201src.tar.gz) = 2314392
diff --git a/lang/moscow_ml/files/patch-..__examples__calc__Makefile b/lang/moscow_ml/files/patch-..__examples__calc__Makefile
deleted file mode 100644
index 1743a873889f..000000000000
--- a/lang/moscow_ml/files/patch-..__examples__calc__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../examples/calc/Makefile.orig	Wed Feb  4 13:30:56 2004
-+++ ../examples/calc/Makefile	        Wed Feb  4 13:31:05 2004
-@@ -2,8 +2,8 @@
- 
- MOSMLHOME=${HOME}/mosml
- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
--MOSMLLEX=${MOSMLHOME}/bin/mosmllex
--MOSMLYACC=${MOSMLHOME}/bin/mosmlyac
-+MOSMLLEX=mosmllex
-+MOSMLYACC=mosmlyac
- 
- MOSMLC=mosmlc -c
- MOSMLL=mosmlc
diff --git a/lang/moscow_ml/files/patch-Makefile b/lang/moscow_ml/files/patch-Makefile
deleted file mode 100644
index 0450830c28b5..000000000000
--- a/lang/moscow_ml/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Tue Jul 18 16:16:44 2000
-+++ Makefile	Fri Feb  6 14:41:12 2004
-@@ -17,6 +17,8 @@
- 
- world:
- 	cd config; sh autoconf $(CC)
-+	ln -fs ../config/m.h runtime/m.h
-+	ln -fs ../config/s.h runtime/s.h
- 	cd runtime; make all
- 	cp runtime/camlrunm$(EXE) .
- 	cd mosmlyac; make all
-@@ -25,6 +27,7 @@
- 	cd toolssrc; make all
- 	cd lex; make all
- 	cd launch; make all
-+	cd dynlibs; make all
- 
- uptodate:
- 	cd runtime; make all
-@@ -35,6 +38,7 @@
- 	cd toolssrc; make all
- 	cd lex; make all
- 	cd launch; make all
-+	cd dynlibs; make all
- 
- # Recompile all Mosml code from scratch
- again:
-@@ -58,7 +62,7 @@
- 	cd compiler; make install
- 	cd toolssrc; make install
- 	cd lex; make install
--	(cd $(INCDIR)/..; rm -f config; ln -s include config)
-+	cd dynlibs; make install
- 	cd doc; make install
- 
- # Remove all generated files
diff --git a/lang/moscow_ml/files/patch-Makefile.inc b/lang/moscow_ml/files/patch-Makefile.inc
deleted file mode 100644
index a42d148b6599..000000000000
--- a/lang/moscow_ml/files/patch-Makefile.inc
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.inc.orig	2004-01-19 15:03:37.000000000 +0000
-+++ Makefile.inc
-@@ -2,7 +2,6 @@
- 
- # Where to install stuff
- 
--MOSMLHOME=${HOME}/mosml
- 
- # Various utility programs
- INSTALL_PROGRAM=cp
-@@ -15,7 +14,7 @@ PERL=perl
- 
- ADDPRIMS=dynlib.c
- ADDOBJS=dynlib.o
--ADDRUNLIBS=-ldl
-+ADDRUNLIBS=
- ADDRUNCFLAGS=
- ADDDYNLIBCFLAGS=
- 
-@@ -45,13 +44,14 @@ DYNLD=ld -shared
- 
- # For NetBSD, use:
- # ------------------------
--# CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
--# STRIP=/usr/bin/strip
--# ADDRUNCFLAGS=-fPIC
--# ADDDYNLIBCFLAGS=-fPIC
--# INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
--# INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
--# INSTALL_DATA=${BSD_INSTALL_DATA}
-+CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
-+STRIP=/usr/bin/strip
-+ADDRUNCFLAGS=-fPIC
-+ADDDYNLIBCFLAGS=-fPIC
-+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
-+INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
-+INSTALL_DATA=${BSD_INSTALL_DATA}
-+LD=${CC} -rdynamic
- 
- # For Solaris 2 (not SunOS 4), use:
- # ---------------------------------
-@@ -113,13 +113,11 @@ SHELL=/bin/sh
- # INCDIR contains the runtime system header files (for compiling dynlibs)
- # DOCDIR contains documentation
- 
--BINDIR=${MOSMLHOME}/bin
--LIBDIR=${MOSMLHOME}/lib
--INCDIR=${MOSMLHOME}/include
--DOCDIR=${MOSMLHOME}/doc
--TOOLDIR=${MOSMLHOME}/tools
--# LIBDIR=${MOSMLHOME}/lib/moscow_ml
--# TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
-+BINDIR=${DESTDIR}${PREFIX}/bin
-+LIBDIR=${DESTDIR}${PREFIX}/lib/mosml
-+INCDIR=${DESTDIR}${PREFIX}/include/mosml
-+DOCDIR=${DESTDIR}${DOCSDIR}
-+TOOLDIR=${DESTDIR}${PREFIX}/libexec/mosml
- 
- CAMLRT=../runtime
- 
-@@ -142,7 +140,7 @@ MOSMLDEP=../camlrunm ../mosmldep
- # For cross-compiling to Win 32 (from Linux) (development only)
- # CPP=/lib/cpp -P -traditional -Umsdos -Uunix -Dwin32
- 
--CC=gcc
-+CC ?= gcc
- 
- .SUFFIXES :
- .SUFFIXES : .sml .sig .ui .uo .mlp .lex .c .o
diff --git a/lang/moscow_ml/files/patch-README b/lang/moscow_ml/files/patch-README
deleted file mode 100644
index a49ab6f54bf2..000000000000
--- a/lang/moscow_ml/files/patch-README
+++ /dev/null
@@ -1,19 +0,0 @@
----  ../README.orig	Fri Jun 30 16:38:16 2000
-+++  ../README	Sat Feb 26 11:17:52 2005
-@@ -1,12 +1,13 @@
--This is file README for Moscow ML 2.00 for Linux/Unix (June 2000)
-+This is file README for Moscow ML 2.01 for Linux/Unix (Jan 2004)
- 
- EXTENT OF THE IMPLEMENTATION
- 
--The current version 2.00 of Moscow ML
-+The current version 2.01 of Moscow ML
- 
-+    * fixes Y2004 bugs in handling of time values
-     * implements the full Standard ML language, as revised 1997, 
-       including Modules and some extensions
--    * yet is backwards compatible with versions prior to 2.00
-+    * yet is backwards compatible with versions prior to 2.01
-     * implements large parts of the new SML Basis Library
-     * implements separate compilation 
-     * can produce compact stand-alone executables (a la Caml Light)
diff --git a/lang/moscow_ml/files/patch-config__Makefile b/lang/moscow_ml/files/patch-config__Makefile
deleted file mode 100644
index 7883a321c191..000000000000
--- a/lang/moscow_ml/files/patch-config__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makefile.orig	Wed Feb 16 16:36:57 2000
-+++ config/Makefile	Wed Apr 10 00:21:46 2002
-@@ -4,7 +4,7 @@
- 	@echo "Run 'sh autoconf' or 'sh autoconf gcc' or ..."
- 
- install:
--	$(INSTALL_PROGRAM) m.h s.h $(INCDIR)
-+	$(INSTALL_DATA) m.h s.h $(INCDIR)
- 
- clean scratch:
- 	rm -f m.h s.h
diff --git a/lang/moscow_ml/files/patch-config__auto_aux__endian.c b/lang/moscow_ml/files/patch-config__auto_aux__endian.c
deleted file mode 100644
index 6242749ff309..000000000000
--- a/lang/moscow_ml/files/patch-config__auto_aux__endian.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- config/auto-aux/endian.c.orig	Fri Jan 21 11:07:13 2000
-+++ config/auto-aux/endian.c	Sat Jan 29 21:40:20 2005
-@@ -1,3 +1,5 @@
-+#include <sys/endian.h>
-+
- main()
- {
-   long n[2];
-@@ -6,9 +8,11 @@
-   n[0] = 0x41424344;
-   n[1] = 0;
-   p = (char *) n;
--  if (strcmp(p, "ABCD") == 0)
-+#if BYTE_ORDER == BIG_ENDIAN
-     exit(0);
--  if (strcmp(p, "DCBA") == 0)
-+#elif BYTE_ORDER == LITTLE_ENDIAN
-     exit(1);
-+#else
-   exit(2);
-+#endif
- }
diff --git a/lang/moscow_ml/files/patch-config__auto_aux__hasgot b/lang/moscow_ml/files/patch-config__auto_aux__hasgot
deleted file mode 100644
index 496e137b5f6e..000000000000
--- a/lang/moscow_ml/files/patch-config__auto_aux__hasgot
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/auto-aux/hasgot.orig	2011-07-25 21:36:30.000000000 +0200
-+++ config/auto-aux/hasgot	2011-07-25 21:36:36.000000000 +0200
-@@ -1,5 +1,7 @@
- #!/bin/sh
--(echo "main() {"
-+(
-+ for f in $*; do echo "extern void $f(void);"; done
-+ echo "int main() {"
-  for f in $*; do echo "  $f();"; done
-- echo "}") > hasgot.c
--exec $cc -o tst hasgot.c > /dev/null 2>/dev/null
-+ echo "return 0; }") > hasgot.c
-+exec $cc -o tst hasgot.c
diff --git a/lang/moscow_ml/files/patch-doc__Makefile b/lang/moscow_ml/files/patch-doc__Makefile
deleted file mode 100644
index 0a5efbec50c9..000000000000
--- a/lang/moscow_ml/files/patch-doc__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- doc/Makefile.orig	Fri Feb  6 14:26:12 2004
-+++ doc/Makefile	Fri Feb  6 14:28:53 2004
-@@ -48,10 +48,12 @@
- 	psnup -pa4 -2 mosmllib.ps mosmllib2up.ps
- 
- install:
-+.if !defined(NOPORTDOCS)
- 	cp mosmlref.pdf $(DOCDIR)
- 	cp manual.pdf $(DOCDIR)
- 	cp mosmllib.pdf $(DOCDIR)
- 	cp mosmllib2up.pdf $(DOCDIR)
-+.endif
- 	cd helpsigs; make install
- 
- clean:
diff --git a/lang/moscow_ml/files/patch-doc__helpsigs__Makefile b/lang/moscow_ml/files/patch-doc__helpsigs__Makefile
deleted file mode 100644
index d69795e4ab14..000000000000
--- a/lang/moscow_ml/files/patch-doc__helpsigs__Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/helpsigs/Makefile.orig	Fri Feb  6 14:29:49 2004
-+++ doc/helpsigs/Makefile	Fri Feb  6 14:30:20 2004
-@@ -23,9 +23,11 @@
- 
- install:
- 	cp helpsigs.val $(LIBDIR)
-+.if !defined(NOPORTDOCS)
- 	test -d $(DOCDIR)/mosmllib || mkdir -p $(DOCDIR)/mosmllib
- 	cp htmlsigs/*.html $(DOCDIR)/mosmllib
- 	cp index.html $(DOCDIR)/mosmllib
-+.endif
- 
- depend: Lexer.sml Parser.sml 
- 	rm -f Makefile.bak
diff --git a/lang/moscow_ml/files/patch-dynlibs__Makefile b/lang/moscow_ml/files/patch-dynlibs__Makefile
deleted file mode 100644
index 34f68ae4b2a3..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
---- dynlibs/Makefile.orig	Sun Feb  6 15:08:02 2000
-+++ dynlibs/Makefile	Fri Apr 12 02:16:37 2002
-@@ -1,24 +1,24 @@
- 
- all:
--	cd interface; make 
--	cd intinf; make 
--	cd mgd; make 
--	cd mgdbm; make 
--	cd mmysql; make 
--	cd mpq; make 
--	cd mregex; make 
--	cd msocket; make 
--	cd munix; make 
-+	#cd interface; make INCDIR=../../runtime
-+	cd intinf; make INCDIR=../../runtime
-+	#cd mgd; make INCDIR=../../runtime
-+	cd mgdbm; make INCDIR=../../runtime
-+	#cd mmysql; make INCDIR=../../runtime
-+	#cd mpq; make INCDIR=../../runtime
-+	cd mregex; make INCDIR=../../runtime
-+	cd msocket; make INCDIR=../../runtime
-+	cd munix; make INCDIR=../../runtime
- 
- install:
--	cd intinf; make install 
--	cd mgd; make install 
--	cd mgdbm; make install 
--	cd mmysql; make install 
--	cd mpq; make install 
--	cd mregex; make install 
--	cd msocket; make install 
--	cd munix; make install 
-+	cd intinf; make INCDIR=../../runtime install 
-+	#cd mgd; make INCDIR=../../runtime install 
-+	cd mgdbm; make INCDIR=../../runtime install 
-+	#cd mmysql; make INCDIR=../../runtime install 
-+	#cd mpq; make INCDIR=../../runtime install 
-+	cd mregex; make INCDIR=../../runtime install 
-+	cd msocket; make INCDIR=../../runtime install 
-+	cd munix; make INCDIR=../../runtime install 
- 
- test:
- 	cd interface; make test 
diff --git a/lang/moscow_ml/files/patch-dynlibs__crypt__Makefile b/lang/moscow_ml/files/patch-dynlibs__crypt__Makefile
deleted file mode 100644
index 935ea600f9a7..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__crypt__Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- dynlibs/crypt/Makefile.orig	Fri Feb  6 09:30:42 2004
-+++ dynlibs/crypt/Makefile	Fri Feb  6 09:32:47 2004
-@@ -1,20 +1,16 @@
- # Makefile for Moscow ML dynamic libraries: the crypt example
- 
--include ../../Makefile.inc
--
--OPTS=-fno-defer-pop
--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
--BASELIBS=-lm -ldl
-+CFLAGS += -Dunix -fno-defer-pop -fPIC 
-+INC += -I/usr/local/include/mosml
- 
- all: libcrypt.so 
- 	@echo "Now execute 'mosml crypt.sml' to test the C function"
- 
- crypt.o: crypt.c
--	$(CC) $(CFLAGS) -c -o crypt.o crypt.c
-+	$(CC) $(CFLAGS) $(INC) -c -o crypt.o crypt.c
- 
- libcrypt.so: crypt.o
--	$(DYNLD) -lcrypt -o libcrypt.so crypt.o
--#	$(DYNLD)         -o libcrypt.so crypt.o
-+	$(LD) -shared -o libcrypt.so -lcrypt crypt.o
- 
- clean:
- 	rm -f *.o
diff --git a/lang/moscow_ml/files/patch-dynlibs__interface__Makefile b/lang/moscow_ml/files/patch-dynlibs__interface__Makefile
deleted file mode 100644
index 925bfbff7c7b..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__interface__Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- dynlibs/interface/Makefile.orig	Tue Mar 14 16:40:47 2000
-+++ dynlibs/interface/Makefile	Fri Feb  6 13:15:42 2004
-@@ -1,17 +1,15 @@
- # Makefile for Moscow ML dynamic libraries: the interface example
- 
--include ../../Makefile.inc
--
--OPTS=-fno-defer-pop
--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
-+CFLAGS += -Dunix -fno-defer-pop -fPIC
-+INC += -I/usr/local/include/mosml
- 
- all: libcside.so
- 
- cside.o: cside.c
--	$(CC) $(CFLAGS) -c -o cside.o cside.c
-+	$(CC) $(CFLAGS) $(INC) -c -o cside.o cside.c
- 
- libcside.so: cside.o
--	$(DYNLD) -o libcside.so cside.o
-+	$(LD) -shared -o libcside.so cside.o
- 
- clean:
- 	rm -f *.o
diff --git a/lang/moscow_ml/files/patch-dynlibs__intinf__Makefile b/lang/moscow_ml/files/patch-dynlibs__intinf__Makefile
deleted file mode 100644
index 541ecaafcae7..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__intinf__Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
---- dynlibs/intinf/Makefile.orig	Wed Feb 16 16:36:57 2000
-+++ dynlibs/intinf/Makefile	Sun Jun 15 15:15:38 2003
-@@ -10,10 +10,11 @@
- include ../../Makefile.inc
- 
- OPTS=-fno-defer-pop
--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPDIR}
-+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
- 
- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
--MOSMLC=mosmlc -c
-+#MOSMLC=mosmlc -c
-+MOSMLC=../../runtime/camlrunm ../../compiler/mosmlcmp -stdlib ../../mosmllib -P none
- MOSMLL=mosmlc
- MOSMLLEX=mosmllex
- MOSMLYACC=mosmlyac
-@@ -21,13 +22,13 @@
- all: libmgmp.so IntInf.uo
- 
- install:
--	cp libmgmp.so $(LIBDIR)
-+	cp libmgmp.so IntInf.sig IntInf.ui IntInf.uo $(LIBDIR)
- 
- intinf.o: intinf.c
- 	$(CC) $(CFLAGS) -c -o intinf.o intinf.c
- 
- libmgmp.so: intinf.o
--	$(DYNLD) -o libmgmp.so intinf.o ${GMPDIR}/libgmp.a
-+	$(DYNLD) ${LDFLAGS} -o libmgmp.so intinf.o -lgmp
- 
- test:
- 	mosml testintinf.sml
diff --git a/lang/moscow_ml/files/patch-dynlibs__mregex__Makefile b/lang/moscow_ml/files/patch-dynlibs__mregex__Makefile
deleted file mode 100644
index 7b362243b6bb..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__mregex__Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- dynlibs/mregex/Makefile.orig	Thu Feb  5 15:17:45 2004
-+++ dynlibs/mregex/Makefile	Fri Feb  6 13:45:59 2004
-@@ -20,8 +20,7 @@
- 	$(CC) $(CFLAGS) -c -o mregex.o mregex.c
- 
- libmregex.so: mregex.o
--	(cd regex-0.12; ./configure; make regex.o)
--	$(DYNLD) -o libmregex.so regex-0.12/regex.o mregex.o 
-+	$(DYNLD) -o libmregex.so mregex.o 
- 
- install:
- 	cp libmregex.so $(LIBDIR)
diff --git a/lang/moscow_ml/files/patch-dynlibs__mregex__mregex.c b/lang/moscow_ml/files/patch-dynlibs__mregex__mregex.c
deleted file mode 100644
index aa1645c172cf..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__mregex__mregex.c
+++ /dev/null
@@ -1,129 +0,0 @@
---- dynlibs/mregex/mregex.c.orig	Fri Feb  6 13:35:06 2004
-+++ dynlibs/mregex/mregex.c	Fri Feb  6 13:45:45 2004
-@@ -7,7 +7,7 @@
- 
- #include <stdlib.h>
- #include <sys/types.h>
--#include "regex-0.12/regex.h"
-+#include <regex.h>
- 
- /* Moscow ML specific includes: */
- 
-@@ -17,10 +17,6 @@
- #include <str.h>		/* For string_length                       */
- #include <fail.h>		/* For failwith                            */
- 
--/* Special version of regexec, defined at the end of this file */
--
--int mosml_regexec();
--
- #ifdef WIN32
- #define EXTERNML __declspec(dllexport)
- #else
-@@ -135,8 +131,7 @@
- value regmatch_sus(regex_t* preg, int nmatch, regmatch_t pmatch[], 
- 		   int eflags, value susval) {
-   char* str = susaddr_susval(susval);
--  int len = len_susval(susval);
--  int matcherror = mosml_regexec(preg, str, len, nmatch, pmatch, eflags);
-+  int matcherror = regexec(preg, str, nmatch, pmatch, eflags);
-   if (matcherror == 0) {
-     /* Find actual number of named substrings */
-     value res;
-@@ -208,8 +203,7 @@
- 
- value regmatch_bool(regex_t* preg, int eflags, value susval) {
-   char* str = susaddr_susval(susval);
--  int len = len_susval(susval);
--  int matcherror = mosml_regexec(preg, str, len, 0, NULL, eflags | REG_NOSUB);
-+  int matcherror = regexec(preg, str, 0, NULL, eflags);
-   return Val_bool(matcherror == 0);
- }
- 
-@@ -278,86 +272,4 @@
-   }
-   /* Unreachable: */
-   return Val_false;
--}
--
--/* This is copied from GNU regex-0.12 file regex.c, and renamed from
--   regexec to mosml_regexec.  The only change is that mosml_regexec
--   receives the (sub)string's length as an argument, and so avoids
--   calling strlen.  This dramatically speeds up the replace,
--   substitute, tokens, and fields functions in the Regex ML structure:
--   the asymptotic execution time changes from quadratic to linear.
--
--   It is pretty silly to have to copy the entire function just to
--   achieve this.  Superficially, the fault is with POSIX 1003.2 for
--   not accommodating searches in substrings of long strings.  More
--   fundamentally, C's notion of null-terminated string is lame: taking
--   time O(n) to determine the length of a string is damn poor.
--   
--   sestoft@dina.kvl.dk 
--*/
--
--typedef char boolean;
--#define false 0
--#define true 1
--#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
--
--int
--mosml_regexec (preg, string, len /* NEW */, nmatch, pmatch, eflags)
--    const regex_t *preg;
--    const char *string; 
--    int len;			/* NEW */
--    size_t nmatch; 
--    regmatch_t pmatch[]; 
--    int eflags;
--{
--  int ret;
--  struct re_registers regs;
--  regex_t private_preg;
--  boolean want_reg_info = !preg->no_sub && nmatch > 0;
--
--  private_preg = *preg;
--  
--  private_preg.not_bol = !!(eflags & REG_NOTBOL);
--  private_preg.not_eol = !!(eflags & REG_NOTEOL);
--  
--  /* The user has told us exactly how many registers to return
--     information about, via `nmatch'.  We have to pass that on to the
--     matching routines.  */
--  private_preg.regs_allocated = REGS_FIXED;
--  
--  if (want_reg_info)
--    {
--      regs.num_regs = nmatch;
--      regs.start = TALLOC (nmatch, regoff_t);
--      regs.end = TALLOC (nmatch, regoff_t);
--      if (regs.start == NULL || regs.end == NULL)
--        return (int) REG_NOMATCH;
--    }
--
--  /* Perform the searching operation.  */
--  ret = re_search (&private_preg, string, len,
--                   /* start: */ 0, /* range: */ len,
--                   want_reg_info ? &regs : (struct re_registers *) 0);
--  
--  /* Copy the register information to the POSIX structure.  */
--  if (want_reg_info)
--    {
--      if (ret >= 0)
--        {
--          unsigned r;
--
--          for (r = 0; r < nmatch; r++)
--            {
--              pmatch[r].rm_so = regs.start[r];
--              pmatch[r].rm_eo = regs.end[r];
--            }
--        }
--
--      /* If we needed the temporary register info, free the space now.  */
--      free (regs.start);
--      free (regs.end);
--    }
--
--  /* We want zero return to mean success, unlike `re_search'.  */
--  return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
- }
diff --git a/lang/moscow_ml/files/patch-dynlibs__msocket__msocket.c b/lang/moscow_ml/files/patch-dynlibs__msocket__msocket.c
deleted file mode 100644
index e0f6e8d8482f..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__msocket__msocket.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- dynlibs/msocket/msocket.c.orig	Fri Jan 21 15:37:13 2000
-+++ dynlibs/msocket/msocket.c	Sun Jun  9 12:40:19 2002
-@@ -68,7 +68,7 @@
- #ifdef macintosh
- #define Sock_val(x) (Field(x,0))
- #else
--#define Sock_val(x) ((int) Field(x,0))
-+#define Sock_val(x) (Field(x,0))
- #endif
-
- /* Decomposition of addr values: */
-@@ -469,6 +469,7 @@
- EXTERNML value msocket_bind(value socket, value address) {
-   int ret, size;
-   union saddr addr;
-+  bzero(&addr, sizeof(addr));
-   make_saddr(&addr, address);
-   size  = Int_val(Size_addrval(address));
-   ret = bind(Sock_val(socket), &addr.sockaddr_gen, size);
-@@ -486,6 +487,7 @@
-   int ret, size;
-   union saddr addr;
-  
-+  bzero(&addr, sizeof(addr));
-   make_saddr(&addr, address);
-   size  = Int_val(Size_addrval(address));
- 
-@@ -572,6 +574,7 @@
-   signal(SIGPIPE, SIG_IGN);
- #endif
-  
-+  bzero(&addr, sizeof(addr));
-   make_saddr(&addr, address);
-   enter_blocking_section();
-   ret = sendto(Sock_val(sock), &Byte(buff, Long_val(Field(tup,0))), 
diff --git a/lang/moscow_ml/files/patch-dynlibs__munix__munix.c b/lang/moscow_ml/files/patch-dynlibs__munix__munix.c
deleted file mode 100644
index f5dca2c3210e..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs__munix__munix.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- dynlibs/munix/munix.c.orig	Fri Jan 21 11:07:13 2000
-+++ dynlibs/munix/munix.c	Fri Apr 12 00:27:33 2002
-@@ -59,8 +59,9 @@
-     failwith("EINVAL"); break;
-   case EISDIR:
-     failwith("EISDIR"); break;
--  case ELIBBAD:
-+/*  case ELIBBAD:
-     failwith("ELIBBAD"); break;
-+ */
-   case ECHILD:
-     failwith("ECHILD"); break;
-   case EINTR:
diff --git a/lang/moscow_ml/files/patch-dynlibs_mgdbm_Makefile b/lang/moscow_ml/files/patch-dynlibs_mgdbm_Makefile
deleted file mode 100644
index 2c059c4ff01e..000000000000
--- a/lang/moscow_ml/files/patch-dynlibs_mgdbm_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- dynlibs/mgdbm/Makefile.orig
-+++ dynlibs/mgdbm/Makefile
-@@ -5,8 +5,8 @@
- 
- # Where to find GDBM header file and compiled library
- 
--GDBMLIBDIR=${HOME}/c/gdbm-1.7.3
--GDBMINCDIR=${HOME}/c/gdbm-1.7.3
-+GDBMLIBDIR=${LOCALBASE}/lib
-+GDBMINCDIR=${LOCALBASE}/include
- #GDBMLIBDIR=/usr/lib
- #GDBMINCDIR=/usr/include
- 
-@@ -25,7 +25,7 @@
- 	$(CC) $(CFLAGS) -c -o mgdbm.o mgdbm.c 
- 
- libmgdbm.so: mgdbm.o
--	$(DYNLD) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.a
-+	$(DYNLD) -o libmgdbm.so mgdbm.o -L${GDBMLIBDIR} -lgdbm
- 
- test:
- 	mosml -P full testgdbm.sml
diff --git a/lang/moscow_ml/files/patch-mosmlyac__Makefile b/lang/moscow_ml/files/patch-mosmlyac__Makefile
deleted file mode 100644
index 4d3ef386c11d..000000000000
--- a/lang/moscow_ml/files/patch-mosmlyac__Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- mosmlyac/Makefile.orig	Tue Feb  3 21:13:27 2004
-+++ mosmlyac/Makefile	Tue Feb  3 21:13:37 2004
-@@ -1,6 +1,6 @@
- # Unix Makefile for the parser generator.
- 
--CFLAGS=-O -DNDEBUG
-+CFLAGS += -DNDEBUG
- 
- include ../Makefile.inc
- 
diff --git a/lang/moscow_ml/files/patch-runtime__Makefile b/lang/moscow_ml/files/patch-runtime__Makefile
deleted file mode 100644
index a52bf07ea01f..000000000000
--- a/lang/moscow_ml/files/patch-runtime__Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- runtime/Makefile.orig	Tue Jul 18 16:16:44 2000
-+++ runtime/Makefile	Wed Apr 10 00:19:10 2002
-@@ -47,7 +47,7 @@
- 
- install:
- 	${INSTALL_PROGRAM} camlrunm$(EXE) $(BINDIR)
--	${INSTALL_PROGRAM} *.h $(INCDIR)
-+	${INSTALL_DATA} *.h $(INCDIR)
- 
- primitives : $(PRIMS)
- 	sed -n -e '/\/\* ML \*\//s/.* \([a-zA-Z0-9_][a-zA-Z0-9_]*\) *(.*/\1/p' \
-@@ -87,8 +87,8 @@
- depend : prims.c opnames.h jumptbl.h
- 	mv Makefile Makefile.bak
- 	(sed -n -e '1,/^### DO NOT DELETE THIS LINE/p' Makefile.bak;	 \
--         gcc -MM -I.. $(OPTS) *.c; \
--         gcc -MM -I.. $(OPTS) -DDEBUG *.c | sed -e 's/\.o/.d.o/') > Makefile
-+         $(CC) -MM -I.. $(OPTS) *.c; \
-+         $(CC) -MM -I.. $(OPTS) -DDEBUG *.c | sed -e 's/\.o/.d.o/') > Makefile
- 	rm Makefile.bak
-
- ### EVERYTHING THAT GOES BEYOND THIS COMMENT WILL BE ERASED WITHOUT WARNING
diff --git a/lang/moscow_ml/files/patch-runtime__config.h b/lang/moscow_ml/files/patch-runtime__config.h
deleted file mode 100644
index 375a849c33e9..000000000000
--- a/lang/moscow_ml/files/patch-runtime__config.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- runtime/config.h.orig	Mon Jan 19 16:02:21 2004
-+++ runtime/config.h		Fri Feb  6 09:28:30 2004
-@@ -1,27 +1,8 @@
- #ifndef _config_
- #define _config_
- 
--
--#if defined(__MWERKS__) || defined(THINK_C)
- #include "m.h"
- #include "s.h"
--#else
--#ifdef macintosh
--#include ":::config:m.h"
--#include ":::config:s.h"
--#else
--#if defined(msdos)
--#include "../config.dos/m.h"
--#include "../config.dos/s.h"
--#elif defined(WIN32)
--#include "../config.w32/m.h"
--#include "../config.w32/s.h"
--#else
--#include "../config/m.h"
--#include "../config/s.h"
--#endif
--#endif
--#endif
- 
- #ifdef WIN32
- 
diff --git a/lang/moscow_ml/files/pkg-message.in b/lang/moscow_ml/files/pkg-message.in
deleted file mode 100644
index 684c0803adf5..000000000000
--- a/lang/moscow_ml/files/pkg-message.in
+++ /dev/null
@@ -1,38 +0,0 @@
-Notes for the FreeBSD port
-==========================
-
-Once the port is installed, you are good to go. Be sure to note the
-docs and examples installed in the standard places.
-
-Bugs & Incompatibilities 
-========================
-
-1. Some C-libraries depending on other ports were not built. As a
-consequence, the structures 
-
-        Gdimage, Mysql and Postgres
-
-will fail to load. 
-
-Note that this port is build with LD_RUN_PATH=%%PREFIX%%/lib/mosml,
-so you do not need set LD_LIBRARY_PATH to use any of the dynlibs.
-
-2. The Regex structure now considers the empty string an invalid
-regular expression. Certain GNU regex 0.12 specific performance hacks
-could not be brought to work under FreeBSD, so expect a performance
-penalty relative to, say, GNU/Linux-based mosml distributions. 
-
-Copyright
-=========
-
-The Moscow ML system is governed by three different licenses (due to
-inclusion of other peoples work). For details, refer to the following
-files:
-
-        %%PREFIX%%/share/doc/mosml/copyrght.cl
-        %%PREFIX%%/share/doc/mosml/copyrght.att
-        %%PREFIX%%/share/doc/mosml/README
-
-Non-profit source redistribution seems to be ok.
-
-        -- debois@diku.dk
diff --git a/lang/moscow_ml/pkg-descr b/lang/moscow_ml/pkg-descr
deleted file mode 100644
index 66941e643693..000000000000
--- a/lang/moscow_ml/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-This is Moscow ML, a lightweight implementation of Standard ML:
-
-The current version (v2.01) of Moscow ML
-    * implements Standard ML, as revised 1997 (value polymorphism, 
-      default overloading resolution, new types)
-    * implements most of the new Standard ML Basis Library, including
-      the most common input/output facilities in TextIO and BinIO.
-    * implements separate compilation
-    * can produce compact stand-alone executables (a la Caml Light)
-    * supports quotations and antiquotations, useful for metaprogramming
-    * includes several new libraries
-    * includes several new libraries (sockets, regex, unix)
-    * offers an easy-to-use foreign-function interface
-
-WWW: http://www.itu.dk/~sestoft/mosml.html
diff --git a/lang/mosml/Makefile b/lang/mosml/Makefile
new file mode 100644
index 000000000000..b4dec11af1c9
--- /dev/null
+++ b/lang/mosml/Makefile
@@ -0,0 +1,55 @@
+# $FreeBSD$
+
+PORTNAME=	mosml
+PORTVERSION=	2.10.1
+CATEGORIES=	lang
+
+MAINTAINER=	johans@FreeBSD.org
+COMMENT=	Lightweight implementation of Standard ML
+
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libgdbm.so:databases/gdbm
+
+GH_ACCOUNT=	kfl
+GH_TAGNAME=	ver-${PORTVERSION}
+USE_GITHUB=	yes
+
+BROKEN_powerpc64=	Does not build
+
+RESTRICTED=	Restrictions on for-profit distribution
+
+USES=		compiler:features gmake perl5
+ALL_TARGET=	world
+MAKE_ARGS=	ADDRUNLIBS= \
+		CPP="${CPP} -P -traditional -Dunix -Umsdos" \
+		DOCSDIR="${DOCSDIR}" \
+		DYNLD="${CC} -shared" \
+		LD="${CC}" \
+		LD_RUN_PATH="${PREFIX}/lib/mosml" \
+		MOSMLHOME="${MOSMLHOME}" \
+		STRIP="${STRIP_CMD}"
+WRKSRC_SUBDIR=	src
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	${REINPLACE_CMD} 's/make /$$(MAKE) /' ${WRKSRC}/doc/Makefile \
+		${WRKSRC}/doc/helpsigs/Makefile
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/../copyrght/copyrght.att \
+		${WRKSRC}/../copyrght/copyrght.cl \
+		${WRKSRC}/../copyrght/gpl2 \
+		${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/../examples && ${TAR} -cf - --dereference \
+		--exclude=\*.orig --exclude=\*.bak --exclude=\*.w32 * | \
+		${TAR} -xf - -C "${STAGEDIR}${EXAMPLESDIR}"
+	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
+	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
+		${STAGEDIR}${PREFIX}/lib/mosml/header
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mosml/lib*.so
+
+.include <bsd.port.post.mk>
diff --git a/lang/mosml/distinfo b/lang/mosml/distinfo
new file mode 100644
index 000000000000..b8361590c3ce
--- /dev/null
+++ b/lang/mosml/distinfo
@@ -0,0 +1,2 @@
+SHA256 (kfl-mosml-2.10.1-ver-2.10.1_GH0.tar.gz) = fed5393668b88d69475b070999b1fd34e902591345de7f09b236824b92e4a78f
+SIZE (kfl-mosml-2.10.1-ver-2.10.1_GH0.tar.gz) = 2558644
diff --git a/lang/mosml/pkg-descr b/lang/mosml/pkg-descr
new file mode 100644
index 000000000000..8777565b82f3
--- /dev/null
+++ b/lang/mosml/pkg-descr
@@ -0,0 +1,13 @@
+This is Moscow ML, a lightweight implementation of Standard ML:
+
+The current version of Moscow ML
+  * implements the full Standard ML language, as revised 1997,
+    including Modules and some extensions
+  * yet is backwards compatible with versions prior to 2.00
+  * implements large parts of the new SML Basis Library
+  * implements separate compilation
+  * can produce compact stand-alone executables (a la Caml Light)
+  * supports quotations and antiquotations, useful for metaprogramming
+  * supports dynamic linking of external functions
+
+WWW: http://mosml.org/
diff --git a/lang/moscow_ml/pkg-plist b/lang/mosml/pkg-plist
index 72ef7ff35a6d..8b075dad200b 100644
--- a/lang/moscow_ml/pkg-plist
+++ b/lang/mosml/pkg-plist
@@ -45,6 +45,9 @@ lib/mosml/Array.uo
 lib/mosml/Array2.sig
 lib/mosml/Array2.ui
 lib/mosml/Array2.uo
+lib/mosml/ArraySlice.sig
+lib/mosml/ArraySlice.ui
+lib/mosml/ArraySlice.uo
 lib/mosml/Arraysort.sig
 lib/mosml/Arraysort.ui
 lib/mosml/Arraysort.uo
@@ -63,6 +66,9 @@ lib/mosml/Binaryset.uo
 lib/mosml/Bool.sig
 lib/mosml/Bool.ui
 lib/mosml/Bool.uo
+lib/mosml/Buffer.sig
+lib/mosml/Buffer.ui
+lib/mosml/Buffer.uo
 lib/mosml/Byte.sig
 lib/mosml/Byte.ui
 lib/mosml/Byte.uo
@@ -75,9 +81,15 @@ lib/mosml/Char.uo
 lib/mosml/CharArray.sig
 lib/mosml/CharArray.ui
 lib/mosml/CharArray.uo
+lib/mosml/CharArraySlice.sig
+lib/mosml/CharArraySlice.ui
+lib/mosml/CharArraySlice.uo
 lib/mosml/CharVector.sig
 lib/mosml/CharVector.ui
 lib/mosml/CharVector.uo
+lib/mosml/CharVectorSlice.sig
+lib/mosml/CharVectorSlice.ui
+lib/mosml/CharVectorSlice.uo
 lib/mosml/CommandLine.sig
 lib/mosml/CommandLine.ui
 lib/mosml/CommandLine.uo
@@ -100,6 +112,9 @@ lib/mosml/Gdimage.sig
 lib/mosml/Gdimage.ui
 lib/mosml/Gdimage.uo
 lib/mosml/General.sig
+lib/mosml/Hashset.sig
+lib/mosml/Hashset.ui
+lib/mosml/Hashset.uo
 lib/mosml/Help.sig
 lib/mosml/Help.ui
 lib/mosml/Help.uo
@@ -193,9 +208,15 @@ lib/mosml/README
 lib/mosml/Random.sig
 lib/mosml/Random.ui
 lib/mosml/Random.uo
+lib/mosml/Rbset.sig
+lib/mosml/Rbset.ui
+lib/mosml/Rbset.uo
 lib/mosml/Real.sig
 lib/mosml/Real.ui
 lib/mosml/Real.uo
+lib/mosml/Redblackmap.sig
+lib/mosml/Redblackmap.ui
+lib/mosml/Redblackmap.uo
 lib/mosml/Regex.sig
 lib/mosml/Regex.ui
 lib/mosml/Regex.uo
@@ -247,6 +268,9 @@ lib/mosml/Unix.uo
 lib/mosml/Vector.sig
 lib/mosml/Vector.ui
 lib/mosml/Vector.uo
+lib/mosml/VectorSlice.sig
+lib/mosml/VectorSlice.ui
+lib/mosml/VectorSlice.uo
 lib/mosml/Weak.sig
 lib/mosml/Weak.ui
 lib/mosml/Weak.uo
@@ -259,25 +283,26 @@ lib/mosml/Word8.uo
 lib/mosml/Word8Array.sig
 lib/mosml/Word8Array.ui
 lib/mosml/Word8Array.uo
+lib/mosml/Word8ArraySlice.sig
+lib/mosml/Word8ArraySlice.ui
+lib/mosml/Word8ArraySlice.uo
 lib/mosml/Word8Vector.sig
 lib/mosml/Word8Vector.ui
 lib/mosml/Word8Vector.uo
+lib/mosml/Word8VectorSlice.sig
+lib/mosml/Word8VectorSlice.ui
+lib/mosml/Word8VectorSlice.uo
 lib/mosml/camlrunm
 lib/mosml/header
 lib/mosml/helpsigs.val
-lib/mosml/libmgdbm.so
 lib/mosml/libmgmp.so
-lib/mosml/libmregex.so
 lib/mosml/libmsocket.so
 lib/mosml/libmunix.so
 lib/mosml/mosmlcmp
 lib/mosml/mosmllex
 lib/mosml/mosmllnk
 lib/mosml/mosmltop
-libexec/mosml/cutdeps
-libexec/mosml/mosmldep
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/copyrght.att
 %%PORTDOCS%%%%DOCSDIR%%/copyrght.cl
 %%PORTDOCS%%%%DOCSDIR%%/gpl2
@@ -286,17 +311,21 @@ libexec/mosml/mosmldep
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/AppleScript.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Array.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Array2.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/ArraySlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Arraysort.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/BasicIO.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/BinIO.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Binarymap.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Binaryset.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Bool.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Buffer.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Byte.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Callback.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Char.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/CharArray.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/CharArraySlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/CharVector.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/CharVectorSlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/CommandLine.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Date.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Dynarray.html
@@ -305,8 +334,10 @@ libexec/mosml/mosmldep
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Gdbm.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Gdimage.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/General.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Hashset.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Help.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Int.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/IntInf.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Intmap.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Intset.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Lexing.html
@@ -333,7 +364,9 @@ libexec/mosml/mosmldep
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Postgres.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Process.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Random.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Rbset.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Real.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Redblackmap.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Regex.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/SML90.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Signal.html
@@ -349,17 +382,18 @@ libexec/mosml/mosmldep
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Timer.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Unix.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Vector.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/VectorSlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Weak.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word8.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word8Array.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word8ArraySlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word8Vector.html
+%%PORTDOCS%%%%DOCSDIR%%/mosmllib/Word8VectorSlice.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/idIndex.html
 %%PORTDOCS%%%%DOCSDIR%%/mosmllib/index.html
-%%PORTDOCS%%%%DOCSDIR%%/mosmllib2up.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mosmlref.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.stub
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/Lexer.lex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/Makefile
@@ -374,15 +408,6 @@ libexec/mosml/mosmldep
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/cgitest.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/htmlform.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/upload.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/crypt/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/crypt/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/crypt/crypt.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/crypt/crypt.sml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/interface/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/interface/cside.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/interface/result.mac
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/interface/smlside.sml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi/interface/smlside_mac.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lexyacc/Data.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lexyacc/Lexer.lex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lexyacc/Main.sml
@@ -420,10 +445,28 @@ libexec/mosml/mosmldep
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/poly.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/recursion.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/sieve.sml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/calendar.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/database.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/dbquery.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/dbrequestform.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/fileindex.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/getcookies.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/hello.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/index.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/logtofile.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/msp.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/mspcompile.sml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/script1.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/script2.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/script3.msp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msp/test.msp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsercomb/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsercomb/Parsercomb.sig
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsercomb/Parsercomb.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsercomb/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsercomb/exprparser.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/paulson/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/paulson/sample.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/paulson/sample10.sml
@@ -464,3 +507,5 @@ libexec/mosml/mosmldep
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webserver/minimalserver.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webserver/mosmlserver.sml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webserver/useit.sml
+%%DATADIR%%/tools/cutdeps
+%%DATADIR%%/tools/mosmldep