13 files changed, 485 insertions, 191 deletions

diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 8e9708680afe..528a83bc93b5 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -6,40 +6,32 @@
 #
 
 PORTNAME=	moscow_ml
-PORTVERSION=	1.4
+PORTVERSION=	2.00
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
-		ftp://ftp.csd.uu.se/pub/mirror/mosml/ \
-		ftp://ftp.dcs.ed.ac.uk/pub/ml/Moscow/
-DISTNAME=	mos14src
+		ftp://ftp.csd.uu.se/pub/mirror/mosml/
+DISTNAME=	mos20src
 
 MAINTAINER=	chuckr@freefall.FreeBSD.org
 
-ALL_TARGET=	world MOSMLHOME=$(PREFIX)/moscow_ml
-INSTALL_TARGET=	install MOSMLHOME=$(PREFIX)/moscow_ml
+MOSMLHOME=	$(PREFIX)/moscow_ml
+
+ALL_TARGET=	world MOSMLHOME=$(MOSMLHOME)
+INSTALL_TARGET=	install MOSMLHOME=$(MOSMLHOME)
 WRKSRC=		${WRKDIR}/mosml/src
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/moscow_ml/doc
-	${MKDIR} ${PREFIX}/moscow_ml/doc/mosmllib
-	${MKDIR} ${PREFIX}/moscow_ml/examples
-	for file in ${WRKDIR}/mosml/doc/*;do \
-	if [ -f $${file} ]; then\
-	${INSTALL_DATA} $${file} ${PREFIX}/moscow_ml/doc;fi;done
-	for file in ${WRKDIR}/mosml/doc/mosmllib/*;do \
-	${INSTALL_DATA} $${file} ${PREFIX}/moscow_ml/doc/mosmllib;done
-	(cd ${WRKDIR}/mosml/examples; \
-	${INSTALL_DATA} README ${PREFIX}/moscow_ml/examples; \
-	for sdirs in manual mls helpsigs calc pretty lexyacc;do \
-	${MKDIR} ${PREFIX}/moscow_ml/examples/$${sdirs}; \
-	for file in $${sdirs}/*;do \
-	if [ -f $${file} ]; then\
-	${INSTALL_DATA} $${file} ${PREFIX}/moscow_ml/examples/$${sdirs}; fi; \
-	done; done;)
-.endif
-	for file in $(PREFIX)/moscow_ml/bin/*;do \
-	if [ -f $${file} ]; then\
-	$(LN) -sf $${file} $(PREFIX)/bin;fi;done
+	${SED} -e 's|^MOSMLHOME=.*|MOSMLHOME=${MOSMLHOME}|' \
+	${WRKDIR}/mosml/tools/Makefile.stub > ${MOSMLHOME}/tools/Makefile.stub
+	for file in ${WRKDIR}/mosml/doc/*; do \
+	if [ -f $${file} ]; then \
+	${INSTALL_DATA} $${file} ${MOSMLHOME}/doc; fi; done
+	@cd ${WRKDIR}/mosml && \
+	${TAR} -cf - examples | \
+	${TAR} -xf - -C "${MOSMLHOME}"
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} "${MOSMLHOME}/examples"
+	for file in ${MOSMLHOME}/bin/*; do \
+	if [ -f $${file} ]; then \
+	$(LN) -sf $${file} $(PREFIX)/bin; fi; done
 
 .include <bsd.port.mk>
diff --git a/lang/moscow_ml/distinfo b/lang/moscow_ml/distinfo
index 461b943edaef..42893a38a989 100644
--- a/lang/moscow_ml/distinfo
+++ b/lang/moscow_ml/distinfo
@@ -1 +1 @@
-MD5 (mos14src.tar.gz) = 54d8515a32af38becbf4a40945f33033
+MD5 (mos20src.tar.gz) = b18f8022a06442f84c8dbfa47067ce07
diff --git a/lang/moscow_ml/files/patch-Makefile b/lang/moscow_ml/files/patch-Makefile
new file mode 100644
index 000000000000..c6a878d0d70f
--- /dev/null
+++ b/lang/moscow_ml/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.orig	Tue Jul 18 16:16:44 2000
++++ Makefile	Fri Apr 12 00:37:51 2002
+@@ -25,6 +25,7 @@
+ 	cd toolssrc; make all
+ 	cd lex; make all
+ 	cd launch; make all
++	cd dynlibs; make all
+ 
+ uptodate:
+ 	cd runtime; make all
+@@ -35,6 +36,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,6 +60,7 @@
+ 	cd compiler; make install
+ 	cd toolssrc; make install
+ 	cd lex; make install
++	cd dynlibs; make install
+ 	(cd $(INCDIR)/..; rm -f config; ln -s include config)
+ 	cd doc; make install
+ 
diff --git a/lang/moscow_ml/files/patch-Makefile.inc b/lang/moscow_ml/files/patch-Makefile.inc
new file mode 100644
index 000000000000..34a207cacbed
--- /dev/null
+++ b/lang/moscow_ml/files/patch-Makefile.inc
@@ -0,0 +1,41 @@
+--- Makefile.inc.orig	Thu Jun 29 02:28:14 2000
++++ Makefile.inc	Wed Apr 10 00:06:57 2002
+@@ -2,7 +2,7 @@
+ 
+ # Where to install stuff
+ 
+-MOSMLHOME=${HOME}/mosml
++#MOSMLHOME=${HOME}/mosml
+ 
+ # Various utility programs
+ INSTALL_PROGRAM=cp
+@@ -15,7 +15,7 @@
+ 
+ ADDPRIMS=dynlib.c
+ ADDOBJS=dynlib.o
+-ADDRUNLIBS=-ldl
++ADDRUNLIBS=
+ ADDRUNCFLAGS=
+ ADDDYNLIBCFLAGS=
+ 
+@@ -45,13 +45,13 @@
+ 
+ # 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}
+ 
+ # For Solaris 2 (not SunOS 4), use:
+ # ---------------------------------
diff --git a/lang/moscow_ml/files/patch-aa b/lang/moscow_ml/files/patch-aa
deleted file mode 100644
index ce827002c551..000000000000
--- a/lang/moscow_ml/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.inc.orig	Wed Aug  4 11:40:24 1999
-+++ Makefile.inc	Fri Jan 14 16:00:57 2000
-@@ -2,7 +2,7 @@
- 
- # Where to install stuff
- 
--MOSMLHOME=${HOME}/mosml
-+#MOSMLHOME=${HOME}/mosml
- 
- # Various utility programs
- INSTALL_PROGRAM=cp
-@@ -15,12 +15,12 @@
- 
- ADDPRIMS=dynlib.c
- ADDOBJS=dynlib.o
--ADDRUNLIBS=-ldl
-+ADDRUNLIBS=
- ADDRUNCFLAGS=
- ADDDYNLIBCFLAGS=
- 
- # For Linux, use:
--CPP=/lib/cpp -P -traditional -Dunix -Umsdos
-+CPP=/usr/bin/cpp -P -traditional
- STRIP=strip
- LD=gcc -rdynamic
- DYNLD=ld -shared
diff --git a/lang/moscow_ml/files/patch-config::Makefile b/lang/moscow_ml/files/patch-config::Makefile
new file mode 100644
index 000000000000..7883a321c191
--- /dev/null
+++ b/lang/moscow_ml/files/patch-config::Makefile
@@ -0,0 +1,11 @@
+--- 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-dynlibs::Makefile b/lang/moscow_ml/files/patch-dynlibs::Makefile
new file mode 100644
index 000000000000..ba74df33e503
--- /dev/null
+++ b/lang/moscow_ml/files/patch-dynlibs::Makefile
@@ -0,0 +1,44 @@
+--- 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::intinf::Makefile b/lang/moscow_ml/files/patch-dynlibs::intinf::Makefile
new file mode 100644
index 000000000000..2302c529bd14
--- /dev/null
+++ b/lang/moscow_ml/files/patch-dynlibs::intinf::Makefile
@@ -0,0 +1,32 @@
+--- dynlibs/intinf/Makefile.orig	Wed Feb 16 16:36:57 2000
++++ dynlibs/intinf/Makefile	Fri Apr 12 02:21:26 2002
+@@ -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) -o libmgmp.so intinf.o -lgmp
+ 
+ test:
+ 	mosml testintinf.sml
diff --git a/lang/moscow_ml/files/patch-dynlibs::munix::munix.c b/lang/moscow_ml/files/patch-dynlibs::munix::munix.c
new file mode 100644
index 000000000000..f5dca2c3210e
--- /dev/null
+++ b/lang/moscow_ml/files/patch-dynlibs::munix::munix.c
@@ -0,0 +1,13 @@
+--- 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-runtime::Makefile b/lang/moscow_ml/files/patch-runtime::Makefile
new file mode 100644
index 000000000000..1d05c283b559
--- /dev/null
+++ b/lang/moscow_ml/files/patch-runtime::Makefile
@@ -0,0 +1,11 @@
+--- 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' \
diff --git a/lang/moscow_ml/pkg-comment b/lang/moscow_ml/pkg-comment
index cfd64506018e..1e31abc9c861 100644
--- a/lang/moscow_ml/pkg-comment
+++ b/lang/moscow_ml/pkg-comment
@@ -1 +1 @@
-Moscow ML, a version of Standard ML
+Moscow ML, a lightweight implementation of Standard ML
diff --git a/lang/moscow_ml/pkg-descr b/lang/moscow_ml/pkg-descr
index 16d81739b71a..4df352bbbdbf 100644
--- a/lang/moscow_ml/pkg-descr
+++ b/lang/moscow_ml/pkg-descr
@@ -1,17 +1,17 @@
-This is Moscow ML, a version of Standard ML:
+This is Moscow ML, a lightweight implementation of Standard ML:
 
-The current version 1.43 of Moscow ML
-    * implements the Core language of Standard ML, as revised 1996
-    * implements large parts of the new SML Basis Library
-    * implements separate compilation and a limited version of the
-      Standard ML Modules language, with signatures and structures
-      but no functors
+The current version 2.00 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 and a new type `char'
+    * includes several new libraries
 
 WWW: http://www.dina.kvl.dk/~sestoft/mosml.html
 
-This is a good version of the ml language if you have limited space.
-If you have sufficient disk space to hold it all, the new smlnj port
-is much more complete and is a better choice.
+This is a good version of the SML language if you have limited space.
+If you have sufficient disk space to hold it all, the sml-nj port
+- which generates native code - might be for you.
diff --git a/lang/moscow_ml/pkg-plist b/lang/moscow_ml/pkg-plist
index 64d9f09c0412..6bf6b105f368 100644
--- a/lang/moscow_ml/pkg-plist
+++ b/lang/moscow_ml/pkg-plist
@@ -7,12 +7,233 @@ moscow_ml/bin/mosml
 moscow_ml/bin/mosmlc
 @exec /bin/ln -s %D/%F %D/bin
 @unexec /bin/rm %D/bin/mosmlc
-moscow_ml/bin/mosmlyac
-@exec /bin/ln -s %D/%F %D/bin
-@unexec /bin/rm %D/bin/mosmlyac
 moscow_ml/bin/mosmllex
 @exec /bin/ln -s %D/%F %D/bin
 @unexec /bin/rm %D/bin/mosmllex
+moscow_ml/bin/mosmlyac
+@exec /bin/ln -s %D/%F %D/bin
+@unexec /bin/rm %D/bin/mosmlyac
+moscow_ml/doc/bugs
+moscow_ml/doc/manual.pdf
+moscow_ml/doc/mosmllib/AppleScript.html
+moscow_ml/doc/mosmllib/Array.html
+moscow_ml/doc/mosmllib/Array2.html
+moscow_ml/doc/mosmllib/Arraysort.html
+moscow_ml/doc/mosmllib/BasicIO.html
+moscow_ml/doc/mosmllib/BinIO.html
+moscow_ml/doc/mosmllib/Binarymap.html
+moscow_ml/doc/mosmllib/Binaryset.html
+moscow_ml/doc/mosmllib/Bool.html
+moscow_ml/doc/mosmllib/Byte.html
+moscow_ml/doc/mosmllib/Callback.html
+moscow_ml/doc/mosmllib/Char.html
+moscow_ml/doc/mosmllib/CharArray.html
+moscow_ml/doc/mosmllib/CharVector.html
+moscow_ml/doc/mosmllib/CommandLine.html
+moscow_ml/doc/mosmllib/Date.html
+moscow_ml/doc/mosmllib/Dynarray.html
+moscow_ml/doc/mosmllib/Dynlib.html
+moscow_ml/doc/mosmllib/FileSys.html
+moscow_ml/doc/mosmllib/Gdbm.html
+moscow_ml/doc/mosmllib/Gdimage.html
+moscow_ml/doc/mosmllib/General.html
+moscow_ml/doc/mosmllib/Help.html
+moscow_ml/doc/mosmllib/Int.html
+moscow_ml/doc/mosmllib/Intmap.html
+moscow_ml/doc/mosmllib/Intset.html
+moscow_ml/doc/mosmllib/Lexing.html
+moscow_ml/doc/mosmllib/List.html
+moscow_ml/doc/mosmllib/ListPair.html
+moscow_ml/doc/mosmllib/Listsort.html
+moscow_ml/doc/mosmllib/Location.html
+moscow_ml/doc/mosmllib/Math.html
+moscow_ml/doc/mosmllib/Meta.html
+moscow_ml/doc/mosmllib/Mosml.html
+moscow_ml/doc/mosmllib/Mosmlcgi.html
+moscow_ml/doc/mosmllib/Mosmlcookie.html
+moscow_ml/doc/mosmllib/Msp.html
+moscow_ml/doc/mosmllib/Mysql.html
+moscow_ml/doc/mosmllib/NJ93.html
+moscow_ml/doc/mosmllib/Nonstdio.html
+moscow_ml/doc/mosmllib/OS.html
+moscow_ml/doc/mosmllib/Option.html
+moscow_ml/doc/mosmllib/PP.html
+moscow_ml/doc/mosmllib/Parsing.html
+moscow_ml/doc/mosmllib/Path.html
+moscow_ml/doc/mosmllib/Polygdbm.html
+moscow_ml/doc/mosmllib/Polyhash.html
+moscow_ml/doc/mosmllib/Postgres.html
+moscow_ml/doc/mosmllib/Process.html
+moscow_ml/doc/mosmllib/Random.html
+moscow_ml/doc/mosmllib/Real.html
+moscow_ml/doc/mosmllib/Regex.html
+moscow_ml/doc/mosmllib/SML90.html
+moscow_ml/doc/mosmllib/Signal.html
+moscow_ml/doc/mosmllib/Socket.html
+moscow_ml/doc/mosmllib/Splaymap.html
+moscow_ml/doc/mosmllib/Splayset.html
+moscow_ml/doc/mosmllib/String.html
+moscow_ml/doc/mosmllib/StringCvt.html
+moscow_ml/doc/mosmllib/Substring.html
+moscow_ml/doc/mosmllib/Susp.html
+moscow_ml/doc/mosmllib/TextIO.html
+moscow_ml/doc/mosmllib/Time.html
+moscow_ml/doc/mosmllib/Timer.html
+moscow_ml/doc/mosmllib/Unix.html
+moscow_ml/doc/mosmllib/Vector.html
+moscow_ml/doc/mosmllib/Weak.html
+moscow_ml/doc/mosmllib/Word.html
+moscow_ml/doc/mosmllib/Word8.html
+moscow_ml/doc/mosmllib/Word8Array.html
+moscow_ml/doc/mosmllib/Word8Vector.html
+moscow_ml/doc/mosmllib/idIndex.html
+moscow_ml/doc/mosmllib/index.html
+moscow_ml/doc/mosmllib.pdf
+moscow_ml/doc/mosmllib2up.pdf
+moscow_ml/doc/mosmlref.pdf
+moscow_ml/doc/recomp
+moscow_ml/doc/releases.txt
+moscow_ml/examples/Makefile
+moscow_ml/examples/Makefile.w32
+moscow_ml/examples/README
+moscow_ml/examples/Readme.w32
+moscow_ml/examples/calc/Lexer.lex
+moscow_ml/examples/calc/Makefile
+moscow_ml/examples/calc/Makefile.w32
+moscow_ml/examples/calc/Parser.grm
+moscow_ml/examples/calc/calc.sml
+moscow_ml/examples/cgi/Makefile
+moscow_ml/examples/cgi/Makefile.w32
+moscow_ml/examples/cgi/README
+moscow_ml/examples/cgi/README1
+moscow_ml/examples/cgi/README2
+moscow_ml/examples/cgi/cgiex1.sml
+moscow_ml/examples/cgi/cgiex2.sml
+moscow_ml/examples/cgi/cgitest.sml
+moscow_ml/examples/cgi/htmlform.html
+moscow_ml/examples/cgi/upload.html
+moscow_ml/examples/lexyacc/Data.sml
+moscow_ml/examples/lexyacc/Lexer.lex
+moscow_ml/examples/lexyacc/Main.sml
+moscow_ml/examples/lexyacc/Makefile
+moscow_ml/examples/lexyacc/Makefile.w32
+moscow_ml/examples/lexyacc/Parser.grm
+moscow_ml/examples/lexyacc/README
+moscow_ml/examples/lexyacc/cl/append.cl
+moscow_ml/examples/lexyacc/cl/edigits.cl
+moscow_ml/examples/lexyacc/cl/error1.cl
+moscow_ml/examples/lexyacc/cl/error2.cl
+moscow_ml/examples/lexyacc/cl/error3.cl
+moscow_ml/examples/lexyacc/cl/fib.cl
+moscow_ml/examples/lexyacc/cl/fibs.cl
+moscow_ml/examples/lexyacc/cl/hamming.cl
+moscow_ml/examples/lexyacc/cl/lists.cl
+moscow_ml/examples/lexyacc/cl/nats.cl
+moscow_ml/examples/lexyacc/cl/sieve.cl
+moscow_ml/examples/lexyacc/cl/takefrom.cl
+moscow_ml/examples/lexyacc/load
+moscow_ml/examples/manual/Evaluate.sig
+moscow_ml/examples/manual/Evaluate.sml
+moscow_ml/examples/manual/Expr.sml
+moscow_ml/examples/manual/Makefile
+moscow_ml/examples/manual/Makefile.w32
+moscow_ml/examples/manual/Reduce.sig
+moscow_ml/examples/manual/Reduce.sml
+moscow_ml/examples/manual/load
+moscow_ml/examples/mls/Makefile
+moscow_ml/examples/mls/Makefile.w32
+moscow_ml/examples/mls/mls.sml
+moscow_ml/examples/modules/README
+moscow_ml/examples/modules/array.sml
+moscow_ml/examples/modules/bootstrap.sml
+moscow_ml/examples/modules/choice.sml
+moscow_ml/examples/modules/collect.sml
+moscow_ml/examples/modules/matrix.sml
+moscow_ml/examples/modules/poly.sml
+moscow_ml/examples/modules/recursion.sml
+moscow_ml/examples/modules/sieve.sml
+moscow_ml/examples/parsercomb/Makefile
+moscow_ml/examples/parsercomb/Parsercomb.sig
+moscow_ml/examples/parsercomb/Parsercomb.sml
+moscow_ml/examples/parsercomb/README
+moscow_ml/examples/paulson/README
+moscow_ml/examples/paulson/sample.sml
+moscow_ml/examples/paulson/sample10.sml
+moscow_ml/examples/paulson/sample2.sml
+moscow_ml/examples/paulson/sample3.sml
+moscow_ml/examples/paulson/sample4.sml
+moscow_ml/examples/paulson/sample5.sml
+moscow_ml/examples/paulson/sample7.sml
+moscow_ml/examples/paulson/sample8.sml
+moscow_ml/examples/paulson/sample9.sml
+moscow_ml/examples/paulson/test10.sml
+moscow_ml/examples/pretty/Makefile
+moscow_ml/examples/pretty/Makefile.w32
+moscow_ml/examples/pretty/ppexpr.sml
+moscow_ml/examples/pretty/pproman.sml
+moscow_ml/examples/small/README
+moscow_ml/examples/small/countperms.sml
+moscow_ml/examples/small/countqueens.sml
+moscow_ml/examples/small/perms.sml
+moscow_ml/examples/small/queens.sml
+moscow_ml/examples/small/roman.sml
+moscow_ml/examples/small/subsets.sml
+moscow_ml/examples/small/subsum.sml
+moscow_ml/examples/units/Evaluate.sig
+moscow_ml/examples/units/Evaluate.sm
+moscow_ml/examples/units/Evaluate.sml
+moscow_ml/examples/units/Expr.sml
+moscow_ml/examples/units/Makefile
+moscow_ml/examples/units/Makefile.w32
+moscow_ml/examples/units/Reduce.sig
+moscow_ml/examples/units/Reduce.sml
+moscow_ml/examples/units/Test.sml
+moscow_ml/examples/units/load
+moscow_ml/examples/weak/Makefile
+moscow_ml/examples/weak/Makefile.w32
+moscow_ml/examples/weak/README
+moscow_ml/examples/weak/hashcons.sml
+moscow_ml/examples/webserver/Makefile
+moscow_ml/examples/webserver/README
+moscow_ml/examples/webserver/echoserver.sml
+moscow_ml/examples/webserver/minimalserver.sml
+moscow_ml/examples/webserver/mosmlserver.sml
+moscow_ml/examples/webserver/useit.sml
+moscow_ml/include/alloc.h
+moscow_ml/include/callback.h
+moscow_ml/include/config.h
+moscow_ml/include/debugger.h
+moscow_ml/include/exec.h
+moscow_ml/include/expand.h
+moscow_ml/include/fail.h
+moscow_ml/include/freelist.h
+moscow_ml/include/gc.h
+moscow_ml/include/gc_ctrl.h
+moscow_ml/include/globals.h
+moscow_ml/include/instruct.h
+moscow_ml/include/interp.h
+moscow_ml/include/intext.h
+moscow_ml/include/io.h
+moscow_ml/include/jumptbl.h
+moscow_ml/include/m.h
+moscow_ml/include/major_gc.h
+moscow_ml/include/md5sum.h
+moscow_ml/include/memory.h
+moscow_ml/include/minor_gc.h
+moscow_ml/include/misc.h
+moscow_ml/include/mlvalues.h
+moscow_ml/include/mosml.h
+moscow_ml/include/prims.h
+moscow_ml/include/reverse.h
+moscow_ml/include/roots.h
+moscow_ml/include/runtime.h
+moscow_ml/include/s.h
+moscow_ml/include/signals.h
+moscow_ml/include/stacks.h
+moscow_ml/include/str.h
+moscow_ml/include/sys.h
+moscow_ml/include/unalignd.h
+moscow_ml/include/version.h
 moscow_ml/lib/AppleScript.sig
 moscow_ml/lib/Array.sig
 moscow_ml/lib/Array.ui
@@ -71,13 +292,21 @@ moscow_ml/lib/FileSys.uo
 moscow_ml/lib/Gdbm.sig
 moscow_ml/lib/Gdbm.ui
 moscow_ml/lib/Gdbm.uo
+moscow_ml/lib/Gdimage.sig
+moscow_ml/lib/Gdimage.ui
+moscow_ml/lib/Gdimage.uo
 moscow_ml/lib/General.sig
 moscow_ml/lib/Help.sig
 moscow_ml/lib/Help.ui
 moscow_ml/lib/Help.uo
+moscow_ml/lib/IO.ui
+moscow_ml/lib/IO.uo
 moscow_ml/lib/Int.sig
 moscow_ml/lib/Int.ui
 moscow_ml/lib/Int.uo
+moscow_ml/lib/IntInf.sig
+moscow_ml/lib/IntInf.ui
+moscow_ml/lib/IntInf.uo
 moscow_ml/lib/Intmap.sig
 moscow_ml/lib/Intmap.ui
 moscow_ml/lib/Intmap.uo
@@ -112,6 +341,15 @@ moscow_ml/lib/Mosml.uo
 moscow_ml/lib/Mosmlcgi.sig
 moscow_ml/lib/Mosmlcgi.ui
 moscow_ml/lib/Mosmlcgi.uo
+moscow_ml/lib/Mosmlcookie.sig
+moscow_ml/lib/Mosmlcookie.ui
+moscow_ml/lib/Mosmlcookie.uo
+moscow_ml/lib/Msp.sig
+moscow_ml/lib/Msp.ui
+moscow_ml/lib/Msp.uo
+moscow_ml/lib/Mysql.sig
+moscow_ml/lib/Mysql.ui
+moscow_ml/lib/Mysql.uo
 moscow_ml/lib/NJ93.sig
 moscow_ml/lib/NJ93.ui
 moscow_ml/lib/NJ93.uo
@@ -141,6 +379,9 @@ moscow_ml/lib/Polygdbm.uo
 moscow_ml/lib/Polyhash.sig
 moscow_ml/lib/Polyhash.ui
 moscow_ml/lib/Polyhash.uo
+moscow_ml/lib/Postgres.sig
+moscow_ml/lib/Postgres.ui
+moscow_ml/lib/Postgres.uo
 moscow_ml/lib/Process.sig
 moscow_ml/lib/Process.ui
 moscow_ml/lib/Process.uo
@@ -151,9 +392,18 @@ moscow_ml/lib/Random.uo
 moscow_ml/lib/Real.sig
 moscow_ml/lib/Real.ui
 moscow_ml/lib/Real.uo
+moscow_ml/lib/Regex.sig
+moscow_ml/lib/Regex.ui
+moscow_ml/lib/Regex.uo
 moscow_ml/lib/SML90.sig
 moscow_ml/lib/SML90.ui
 moscow_ml/lib/SML90.uo
+moscow_ml/lib/Signal.sig
+moscow_ml/lib/Signal.ui
+moscow_ml/lib/Signal.uo
+moscow_ml/lib/Socket.sig
+moscow_ml/lib/Socket.ui
+moscow_ml/lib/Socket.uo
 moscow_ml/lib/Splaymap.sig
 moscow_ml/lib/Splaymap.ui
 moscow_ml/lib/Splaymap.uo
@@ -187,6 +437,9 @@ moscow_ml/lib/Time.uo
 moscow_ml/lib/Timer.sig
 moscow_ml/lib/Timer.ui
 moscow_ml/lib/Timer.uo
+moscow_ml/lib/Unix.sig
+moscow_ml/lib/Unix.ui
+moscow_ml/lib/Unix.uo
 moscow_ml/lib/Vector.sig
 moscow_ml/lib/Vector.ui
 moscow_ml/lib/Vector.uo
@@ -207,142 +460,39 @@ moscow_ml/lib/Word8Vector.ui
 moscow_ml/lib/Word8Vector.uo
 moscow_ml/lib/header
 moscow_ml/lib/helpsigs.val
+moscow_ml/lib/libmgmp.so
+moscow_ml/lib/libmsocket.so
+moscow_ml/lib/libmunix.so
 moscow_ml/lib/mosmlcmp
 moscow_ml/lib/mosmllex
 moscow_ml/lib/mosmllnk
 moscow_ml/lib/mosmltop
-moscow_ml/tools/mosmldep
+moscow_ml/tools/Makefile.stub
 moscow_ml/tools/cutdeps
-moscow_ml/doc/bugs
-moscow_ml/doc/mosmllib/AppleScript.html
-moscow_ml/doc/mosmllib/Array.html
-moscow_ml/doc/mosmllib/Array2.html
-moscow_ml/doc/mosmllib/Arraysort.html
-moscow_ml/doc/mosmllib/BasicIO.html
-moscow_ml/doc/mosmllib/BinIO.html
-moscow_ml/doc/mosmllib/Binarymap.html
-moscow_ml/doc/mosmllib/Binaryset.html
-moscow_ml/doc/mosmllib/Bool.html
-moscow_ml/doc/mosmllib/Byte.html
-moscow_ml/doc/mosmllib/Callback.html
-moscow_ml/doc/mosmllib/Char.html
-moscow_ml/doc/mosmllib/CharArray.html
-moscow_ml/doc/mosmllib/CharVector.html
-moscow_ml/doc/mosmllib/CommandLine.html
-moscow_ml/doc/mosmllib/Date.html
-moscow_ml/doc/mosmllib/Dynarray.html
-moscow_ml/doc/mosmllib/Dynlib.html
-moscow_ml/doc/mosmllib/FileSys.html
-moscow_ml/doc/mosmllib/Gdbm.html
-moscow_ml/doc/mosmllib/Gdimage.html
-moscow_ml/doc/mosmllib/General.html
-moscow_ml/doc/mosmllib/Help.html
-moscow_ml/doc/mosmllib/Int.html
-moscow_ml/doc/mosmllib/Intmap.html
-moscow_ml/doc/mosmllib/Intset.html
-moscow_ml/doc/mosmllib/Lexing.html
-moscow_ml/doc/mosmllib/List.html
-moscow_ml/doc/mosmllib/ListPair.html
-moscow_ml/doc/mosmllib/Listsort.html
-moscow_ml/doc/mosmllib/Location.html
-moscow_ml/doc/mosmllib/Math.html
-moscow_ml/doc/mosmllib/Meta.html
-moscow_ml/doc/mosmllib/Mosml.html
-moscow_ml/doc/mosmllib/Mosmlcgi.html
-moscow_ml/doc/mosmllib/Mysql.html
-moscow_ml/doc/mosmllib/NJ93.html
-moscow_ml/doc/mosmllib/Nonstdio.html
-moscow_ml/doc/mosmllib/OS.html
-moscow_ml/doc/mosmllib/Option.html
-moscow_ml/doc/mosmllib/PP.html
-moscow_ml/doc/mosmllib/Parsing.html
-moscow_ml/doc/mosmllib/Path.html
-moscow_ml/doc/mosmllib/Polygdbm.html
-moscow_ml/doc/mosmllib/Polyhash.html
-moscow_ml/doc/mosmllib/Postgres.html
-moscow_ml/doc/mosmllib/Process.html
-moscow_ml/doc/mosmllib/Random.html
-moscow_ml/doc/mosmllib/Real.html
-moscow_ml/doc/mosmllib/Regex.html
-moscow_ml/doc/mosmllib/SML90.html
-moscow_ml/doc/mosmllib/Socket.html
-moscow_ml/doc/mosmllib/Splaymap.html
-moscow_ml/doc/mosmllib/Splayset.html
-moscow_ml/doc/mosmllib/Splaytree.html
-moscow_ml/doc/mosmllib/String.html
-moscow_ml/doc/mosmllib/StringCvt.html
-moscow_ml/doc/mosmllib/Substring.html
-moscow_ml/doc/mosmllib/Susp.html
-moscow_ml/doc/mosmllib/TextIO.html
-moscow_ml/doc/mosmllib/Time.html
-moscow_ml/doc/mosmllib/Timer.html
-moscow_ml/doc/mosmllib/Vector.html
-moscow_ml/doc/mosmllib/Weak.html
-moscow_ml/doc/mosmllib/Word.html
-moscow_ml/doc/mosmllib/Word8.html
-moscow_ml/doc/mosmllib/Word8Array.html
-moscow_ml/doc/mosmllib/Word8Vector.html
-moscow_ml/doc/mosmllib/idIndex.html
-moscow_ml/doc/mosmllib/index.html
-moscow_ml/doc/manual.pdf
-moscow_ml/doc/mosmlref.pdf
-moscow_ml/doc/recomp
-moscow_ml/doc/releases.txt
-moscow_ml/examples/README
-moscow_ml/examples/calc/Lexer.lex
-moscow_ml/examples/calc/Makefile
-moscow_ml/examples/calc/Makefile.w32
-moscow_ml/examples/calc/Parser.grm
-moscow_ml/examples/calc/calc.sml
-moscow_ml/examples/helpsigs/Asynt.sml
-moscow_ml/examples/helpsigs/Database.sig
-moscow_ml/examples/helpsigs/Database.sml
-moscow_ml/examples/helpsigs/Hasht.sig
-moscow_ml/examples/helpsigs/Hasht.sml
-moscow_ml/examples/helpsigs/Htmlsigs.sig
-moscow_ml/examples/helpsigs/Htmlsigs.sml
-moscow_ml/examples/helpsigs/Lexer.lex
-moscow_ml/examples/helpsigs/Makefile
-moscow_ml/examples/helpsigs/Makefile.w32
-moscow_ml/examples/helpsigs/Parser.grm
-moscow_ml/examples/helpsigs/Parsspec.sml
-moscow_ml/examples/helpsigs/Printbase.sml
-moscow_ml/examples/helpsigs/README
-moscow_ml/examples/helpsigs/Stack.sig
-moscow_ml/examples/helpsigs/Stack.sml
-moscow_ml/examples/helpsigs/makebase.sml
-moscow_ml/examples/lexyacc/Data.sml
-moscow_ml/examples/lexyacc/Lexer.lex
-moscow_ml/examples/lexyacc/Main.sml
-moscow_ml/examples/lexyacc/Makefile
-moscow_ml/examples/lexyacc/Makefile.w32
-moscow_ml/examples/lexyacc/Parser.grm
-moscow_ml/examples/lexyacc/README
-moscow_ml/examples/lexyacc/load
-moscow_ml/examples/manual/Evaluate.sig
-moscow_ml/examples/manual/Evaluate.sml
-moscow_ml/examples/manual/Expr.sml
-moscow_ml/examples/manual/Makefile
-moscow_ml/examples/manual/Makefile.w32
-moscow_ml/examples/manual/Reduce.sig
-moscow_ml/examples/manual/Reduce.sml
-moscow_ml/examples/manual/load
-moscow_ml/examples/mls/Makefile
-moscow_ml/examples/mls/Makefile.w32
-moscow_ml/examples/mls/mls.sml
-moscow_ml/examples/pretty/Makefile
-moscow_ml/examples/pretty/Makefile.w32
-moscow_ml/examples/pretty/ppexpr.sml
+moscow_ml/tools/mosmldep
+@exec /bin/ln -s %D/moscow_ml/bin/camlrunm %D/moscow_ml/lib/camlrunm
+@unexec /bin/rm %D/moscow_ml/lib/camlrunm
+@exec /bin/ln -s %D/moscow_ml/include %D/moscow_ml/config
+@unexec /bin/rm %D/moscow_ml/config
 @dirrm moscow_ml/bin
 @dirrm moscow_ml/doc/mosmllib
 @dirrm moscow_ml/doc
 @dirrm moscow_ml/examples/calc
-@dirrm moscow_ml/examples/helpsigs
+@dirrm moscow_ml/examples/cgi
+@dirrm moscow_ml/examples/lexyacc/cl
 @dirrm moscow_ml/examples/lexyacc
 @dirrm moscow_ml/examples/manual
 @dirrm moscow_ml/examples/mls
+@dirrm moscow_ml/examples/modules
+@dirrm moscow_ml/examples/parsercomb
+@dirrm moscow_ml/examples/paulson
 @dirrm moscow_ml/examples/pretty
+@dirrm moscow_ml/examples/small
+@dirrm moscow_ml/examples/units
+@dirrm moscow_ml/examples/weak
+@dirrm moscow_ml/examples/webserver
 @dirrm moscow_ml/examples
+@dirrm moscow_ml/include
 @dirrm moscow_ml/lib
 @dirrm moscow_ml/tools
 @dirrm moscow_ml