summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorfrueauf <frueauf>1998-12-04 11:09:46 +0000
committerfrueauf <frueauf>1998-12-04 11:09:46 +0000
commit8182b1b88e23ad65f1f1ea43f82877dfe2f2ecf0 (patch)
treef92595d3aebc27ee19cc77ed15fb43d0340d5633 /lang
parent46b57b972f1e9b70687fbb277b54ebb8cd6e41d4 (diff)
downloadpkgsrc-8182b1b88e23ad65f1f1ea43f82877dfe2f2ecf0.tar.gz
Update moscow_ml to 1.43, provided in pr 6527 by Johnny C. Lam with
some refining by myself. New in version 1.43 of Moscow ML: * Arrays of weak pointers (structure Weak). * Dynamic linking of external functions under Linux and Solaris * Access to GNU gdbm persistent hashtables (structures Gdbm, Polygdbm) * The load paths can be set from the interactive system. * The interactive system's prompts and responses can be turned off (option -quietdec, variable Meta.quietdec). * Prettyprinters can be installed also on base types and abstract types. * Mosmllex now supports abbreviations for regular expressions.
Diffstat (limited to 'lang')
-rw-r--r--lang/moscow_ml/Makefile28
-rw-r--r--lang/moscow_ml/files/md54
-rw-r--r--lang/moscow_ml/patches/patch-aa48
-rw-r--r--lang/moscow_ml/patches/patch-ab36
-rw-r--r--lang/moscow_ml/patches/patch-ac15
-rw-r--r--lang/moscow_ml/patches/patch-ad13
-rw-r--r--lang/moscow_ml/patches/patch-ae26
-rw-r--r--lang/moscow_ml/patches/patch-af8
-rw-r--r--lang/moscow_ml/patches/patch-ag10
-rw-r--r--lang/moscow_ml/patches/patch-ah28
-rw-r--r--lang/moscow_ml/patches/patch-ai28
-rw-r--r--lang/moscow_ml/patches/patch-aj18
-rw-r--r--lang/moscow_ml/patches/patch-ak18
-rw-r--r--lang/moscow_ml/pkg/DESCR3
-rw-r--r--lang/moscow_ml/pkg/PLIST110
15 files changed, 254 insertions, 139 deletions
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 6b4e4b21191..d04303f5bb1 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,28 +1,32 @@
-# $NetBSD: Makefile,v 1.4 1998/08/20 15:17:05 tsarna Exp $
+# $NetBSD: Makefile,v 1.5 1998/12/04 11:09:46 frueauf Exp $
#
DISTNAME= mos14src
-PKGNAME= moscow_ml-1.42
+PKGNAME= moscow_ml-1.43
+WRKSRC= ${WRKDIR}/mosml/src
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/mosml/
+MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/mosml/ \
+ ftp://ftp.csd.uu.se/pub/mirror/mosml/
MAINTAINER= lamj@stat.cmu.edu
HOMEPAGE= http://www.dina.kvl.dk/~sestoft/mosml.html
-USE_PERL5= yes
-WRKSRC= ${WRKDIR}/mosml/src
-ALL_TARGET= world
+BUILD_DEPENDS+= perl-5.00404:../../lang/perl5
+
+CONFLICTS= moscow_ml-1.42
-.include "../../mk/bsd.prefs.mk"
+ALL_TARGET= clean world
post-install:
-.if !defined(NOPORTDOCS)
+ ${TOUCH} ${WRKDIR}/mosml/examples/helpsigs/htmlsigs/.keep_me
${MKDIR} ${PREFIX}/share/doc/moscow_ml
${MKDIR} ${PREFIX}/share/examples/moscow_ml
-.for file in bugs manual.dvi mosmlref.dvi releases.txt
- ${INSTALL_DATA} ${WRKDIR}/mosml/doc/${file} ${PREFIX}/share/doc/moscow_ml
-.endfor
+ ${CP} ${WRKDIR}/mosml/copyrght/* ${PREFIX}/share/doc/moscow_ml
+ ${CP} -R ${WRKDIR}/mosml/doc/* ${PREFIX}/share/doc/moscow_ml
${CP} -R ${WRKDIR}/mosml/examples/* ${PREFIX}/share/examples/moscow_ml
-.endif
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/moscow_ml
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/moscow_ml
+ ${CHMOD} -R ugo+r ${PREFIX}/share/doc/moscow_ml
+ ${CHMOD} -R ugo+r ${PREFIX}/share/examples/moscow_ml
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/moscow_ml/files/md5 b/lang/moscow_ml/files/md5
index f63266d09ff..45f17d0de94 100644
--- a/lang/moscow_ml/files/md5
+++ b/lang/moscow_ml/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:24:58 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/04 11:09:46 frueauf Exp $
-MD5 (mos14src.tar.gz) = 89bf25e3fda429be019f13c841fd33a1
+MD5 (mos14src.tar.gz) = 3c046ef3f95c57d61cfe5e78092dfa80
diff --git a/lang/moscow_ml/patches/patch-aa b/lang/moscow_ml/patches/patch-aa
index 37db1d7d96e..04e208a1724 100644
--- a/lang/moscow_ml/patches/patch-aa
+++ b/lang/moscow_ml/patches/patch-aa
@@ -1,21 +1,49 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:20 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- Makefile.inc.orig Tue Jul 29 02:58:19 1997
-+++ Makefile.inc Mon Feb 16 21:05:32 1998
-@@ -2,10 +2,10 @@
+--- Makefile.inc.orig Mon Apr 20 11:52:39 1998
++++ Makefile.inc Thu Dec 3 04:05:44 1998
+@@ -2,20 +2,34 @@
- # Edit MOSMLHOME, CPP and STRIP to suit your installation
+ # Where to install stuff
-MOSMLHOME=${HOME}/mosml
+MOSMLHOME=${PREFIX}
++
++# Various utility programs
++INSTALL_PROGRAM=cp
++INSTALL_SCRIPT=cp
++INSTALL_DATA=cp
++PERL=${LOCALBASE}/bin/perl
- # For Linux and other well-behaved systems, use:
+ # To compile the runtime system camlrunm with support for
+ # dynamically loadable libraries (DDLs), uncomment these:
+
+-# ADDPRIMS=dynlib.c
+-# ADDOBJS=dynlib.o
++ADDPRIMS=dynlib.c
++ADDOBJS=dynlib.o
+ # ADDLIBS=-ldl
+ # ADDCFLAGS=-rdynamic
+
++# For NetBSD, use:
++CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
++STRIP=/usr/bin/strip
++ADDCFLAGS=-fPIC
++INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
++INSTALL_DATA=${BSD_INSTALL_DATA}
++
+ # For Linux, use:
-CPP=/lib/cpp -P -traditional -Dunix -Umsdos
-+CPP=/usr/bin/cpp -P -traditional
- STRIP=strip
+-STRIP=strip
+-DYNLD=ld -shared
++#CPP=/lib/cpp -P -traditional -Dunix -Umsdos
++#STRIP=strip
++#DYNLD=ld -shared
- # For HP-UX, use instead:
-@@ -23,8 +23,8 @@
+ # For Solaris 2 (not SunOS 4), use instead:
+ # CPP=/usr/ccs/lib/cpp -P -Dunix -Umsdos
+@@ -41,8 +55,8 @@
# LIBDIR contains bytecode files (such as mosmlcmp and library units)
BINDIR=${MOSMLHOME}/bin
diff --git a/lang/moscow_ml/patches/patch-ab b/lang/moscow_ml/patches/patch-ab
index 160366e979a..40fe49d67ab 100644
--- a/lang/moscow_ml/patches/patch-ab
+++ b/lang/moscow_ml/patches/patch-ab
@@ -1,17 +1,39 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:09:20 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- compiler/Makefile.orig Thu Jul 17 17:33:20 1997
-+++ compiler/Makefile Mon Feb 16 23:58:54 1998
-@@ -104,9 +104,9 @@
+--- compiler/Makefile.orig Sat Apr 11 07:19:17 1998
++++ compiler/Makefile Thu Dec 3 04:01:44 1998
+@@ -70,7 +70,7 @@
+ $(MOSMLL) $(LINKFLAGS) -o mosmlcmp.w32 Mainc.uo
+
+ Opcodes.sml: $(CAMLRT)/instruct.h
+- perl $(MOSMLTOOLS)/mksmlopc $(CAMLRT)/instruct.h > Opcodes.sml
++ $(PERL) $(MOSMLTOOLS)/mksmlopc $(CAMLRT)/instruct.h > Opcodes.sml
+
+ Parser.sml Parser.sig: Parser.grm
+ $(MOSMLYACC) Parser.grm
+@@ -85,10 +85,10 @@
+ $(MOSMLL) $(LINKFLAGS) -o mosmllnk.w32 Mainl.uo
+
+ Predef.sml : $(CAMLRT)/globals.h $(CAMLRT)/fail.h
+- perl $(MOSMLTOOLS)/mksmlpre $(CAMLRT)/globals.h $(CAMLRT)/fail.h > Predef.sml
++ $(PERL) $(MOSMLTOOLS)/mksmlpre $(CAMLRT)/globals.h $(CAMLRT)/fail.h > Predef.sml
+
+ Prim_c.sml : $(CAMLRT)/primitives
+- perl $(MOSMLTOOLS)/mksmlprc $(CAMLRT)/primitives > Prim_c.sml
++ $(PERL) $(MOSMLTOOLS)/mksmlprc $(CAMLRT)/primitives > Prim_c.sml
+
+ mosmltop: $(COMP_OBJS) $(T_OBJS)
+ $(MOSMLL) $(LINKFLAGS) -o mosmltop Maint.uo
+@@ -116,9 +116,9 @@
rm -f Makefile.bak
install:
- cp mosmlcmp $(LIBDIR)
- cp mosmllnk $(LIBDIR)
- cp mosmltop $(LIBDIR)
-+ ${BSD_INSTALL_DATA} mosmlcmp $(LIBDIR)
-+ ${BSD_INSTALL_DATA} mosmllnk $(LIBDIR)
-+ ${BSD_INSTALL_DATA} mosmltop $(LIBDIR)
++ ${INSTALL_DATA} mosmlcmp $(LIBDIR)
++ ${INSTALL_DATA} mosmllnk $(LIBDIR)
++ ${INSTALL_DATA} mosmltop $(LIBDIR)
depend: Filename.sml Config.sml Opcodes.sml Parser.sml Parser.sig Lexer.sml \
Predef.sml Prim_c.sml
diff --git a/lang/moscow_ml/patches/patch-ac b/lang/moscow_ml/patches/patch-ac
index 4cbbea6d73d..274c22a2c29 100644
--- a/lang/moscow_ml/patches/patch-ac
+++ b/lang/moscow_ml/patches/patch-ac
@@ -1,19 +1,18 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:20 agc Exp $
+$NetBSD: patch-ac,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- launch/Makefile.orig Mon Jul 7 04:38:39 1997
-+++ launch/Makefile Tue Feb 17 00:04:36 1998
-@@ -14,12 +14,11 @@
+--- launch/Makefile.orig Mon Jul 7 03:38:39 1997
++++ launch/Makefile Thu Dec 3 03:19:54 1998
+@@ -14,11 +14,11 @@
chmod a+x /tmp/testscr
sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
- else cp camlexec $(LIBDIR)/header; \
-+ else ${BSD_INSTALL_PROGRAM} camlexec $(LIBDIR)/header; \
++ else ${INSTALL_PROGRAM} camlexec $(LIBDIR)/header; \
fi'
rm -f /tmp/testscr
for script in mosml mosmlc; do \
- cp $$script $(BINDIR)/$$script; \
-- chmod a+x $(BINDIR)/$$script; \
-+ ${BSD_INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
++ ${INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
+ chmod a+x $(BINDIR)/$$script; \
done
- mosmlc: mosmlc.tpl
diff --git a/lang/moscow_ml/patches/patch-ad b/lang/moscow_ml/patches/patch-ad
index 4f34ce1339b..4a0d446e6f3 100644
--- a/lang/moscow_ml/patches/patch-ad
+++ b/lang/moscow_ml/patches/patch-ad
@@ -1,15 +1,14 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:20 agc Exp $
+$NetBSD: patch-ad,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- lex/Makefile.orig Wed Oct 23 10:42:57 1996
-+++ lex/Makefile Tue Feb 17 00:24:04 1998
-@@ -34,8 +34,8 @@
+--- lex/Makefile.orig Mon Apr 6 15:01:22 1998
++++ lex/Makefile Thu Dec 3 03:21:13 1998
+@@ -34,7 +34,8 @@
rm -f Makefile.bak
install:
- cat $(LIBDIR)/header mosmllex > $(BINDIR)/mosmllex
-- chmod a+x $(BINDIR)/mosmllex
+ cat $(LIBDIR)/header mosmllex > mosmllex.bin
-+ ${BSD_INSTALL_SCRIPT} mosmllex.bin $(BINDIR)/mosmllex
++ ${INSTALL_SCRIPT} mosmllex.bin $(BINDIR)/mosmllex
+ chmod a+x $(BINDIR)/mosmllex
Grammar.sml Grammar.sig: Grammar.grm
- $(MOSMLYACC) Grammar.grm
diff --git a/lang/moscow_ml/patches/patch-ae b/lang/moscow_ml/patches/patch-ae
index 286d941ac92..53a6d389af0 100644
--- a/lang/moscow_ml/patches/patch-ae
+++ b/lang/moscow_ml/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:21 agc Exp $
+$NetBSD: patch-ae,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- mosmllib/Makefile.orig Thu Jul 17 17:33:44 1997
-+++ mosmllib/Makefile Tue Feb 17 00:07:02 1998
+--- mosmllib/Makefile.orig Mon Apr 6 15:01:10 1998
++++ mosmllib/Makefile Thu Dec 3 03:05:59 1998
@@ -27,14 +27,14 @@
- rm -f Vector.sml Word.sml Word8Array.sml Word8Vector.sml
+ rm -f Vector.sml Word.sml Word8Array.sml Word8Vector.sml Weak.sml
install:
- cp README $(LIBDIR)
@@ -14,14 +14,14 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:09:21 agc Exp $
- cp Meta.fke $(LIBDIR)/Meta.sig
- cp OS.fke $(LIBDIR)/OS.sig
- cp helpsigs.val $(LIBDIR)
-+ ${BSD_INSTALL_DATA} README $(LIBDIR)
-+ ${BSD_INSTALL_DATA} *.ui $(LIBDIR)
-+ ${BSD_INSTALL_DATA} *.uo $(LIBDIR)
-+ ${BSD_INSTALL_DATA} *.sig $(LIBDIR)
-+ ${BSD_INSTALL_DATA} General.fke $(LIBDIR)/General.sig
-+ ${BSD_INSTALL_DATA} Meta.fke $(LIBDIR)/Meta.sig
-+ ${BSD_INSTALL_DATA} OS.fke $(LIBDIR)/OS.sig
-+ ${BSD_INSTALL_DATA} helpsigs.val $(LIBDIR)
++ ${INSTALL_DATA} README $(LIBDIR)
++ ${INSTALL_DATA} *.ui $(LIBDIR)
++ ${INSTALL_DATA} *.uo $(LIBDIR)
++ ${INSTALL_DATA} *.sig $(LIBDIR)
++ ${INSTALL_DATA} General.fke $(LIBDIR)/General.sig
++ ${INSTALL_DATA} Meta.fke $(LIBDIR)/Meta.sig
++ ${INSTALL_DATA} OS.fke $(LIBDIR)/OS.sig
++ ${INSTALL_DATA} helpsigs.val $(LIBDIR)
depend: Array.sml FileSys.sml Help.sml Int.sml Mosml.sml OS.sml Path.sml \
- Strbase.sml Vector.sml Word.sml Word8Array.sml Word8Vector.sml
+ Strbase.sml Vector.sml Word.sml Word8Array.sml Word8Vector.sml Weak.sml
diff --git a/lang/moscow_ml/patches/patch-af b/lang/moscow_ml/patches/patch-af
index 5928a7917ad..2dde3b308f0 100644
--- a/lang/moscow_ml/patches/patch-af
+++ b/lang/moscow_ml/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:09:21 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- mosmlyac/Makefile.orig Mon Oct 16 10:36:52 1995
-+++ mosmlyac/Makefile Tue Feb 17 00:07:43 1998
+--- mosmlyac/Makefile.orig Mon Oct 16 09:36:52 1995
++++ mosmlyac/Makefile Thu Dec 3 03:03:04 1998
@@ -18,7 +18,7 @@
rm -f mosmlyac
install:
- cp mosmlyac $(BINDIR)/mosmlyac
-+ ${BSD_INSTALL_PROGRAM} mosmlyac $(BINDIR)/mosmlyac
++ ${INSTALL_PROGRAM} mosmlyac $(BINDIR)/mosmlyac
depend:
diff --git a/lang/moscow_ml/patches/patch-ag b/lang/moscow_ml/patches/patch-ag
index ae95ab6eb0f..6fb3ce630ee 100644
--- a/lang/moscow_ml/patches/patch-ag
+++ b/lang/moscow_ml/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:09:21 agc Exp $
+$NetBSD: patch-ag,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- runtime/Makefile.orig Tue Jul 29 02:51:01 1997
-+++ runtime/Makefile Mon Feb 16 23:59:45 1998
-@@ -36,7 +36,7 @@
+--- runtime/Makefile.orig Fri Apr 17 07:51:45 1998
++++ runtime/Makefile Thu Dec 3 03:01:16 1998
+@@ -42,7 +42,7 @@
rm -f primitives prims.c opnames.h jumptbl.h
install:
- cp camlrunm $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} camlrunm $(BINDIR)
++ ${INSTALL_PROGRAM} camlrunm $(BINDIR)
primitives : $(PRIMS)
sed -n -e '/\/\* ML \*\//s/.* \([a-zA-Z0-9_][a-zA-Z0-9_]*\) *(.*/\1/p' \
diff --git a/lang/moscow_ml/patches/patch-ah b/lang/moscow_ml/patches/patch-ah
index 360e3602e36..0e9920f65b9 100644
--- a/lang/moscow_ml/patches/patch-ah
+++ b/lang/moscow_ml/patches/patch-ah
@@ -1,13 +1,19 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:09:21 agc Exp $
+$NetBSD: patch-ah,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- toolssrc/Makefile.orig Wed Oct 23 10:35:44 1996
-+++ toolssrc/Makefile Tue Feb 17 00:08:55 1998
-@@ -34,7 +34,7 @@
- rm -f cutdeps mosmldep
+--- runtime/fail.c.orig Wed Feb 11 08:19:54 1998
++++ runtime/fail.c Thu Dec 3 02:57:48 1998
+@@ -1,9 +1,13 @@
+ /* Raising exceptions from C. */
- install:
-- cp cutdeps mosmldep $(TOOLDIR)
-+ ${BSD_INSTALL_DATA} cutdeps mosmldep $(TOOLDIR)
-
- depend: Deplex.sml Deppars.sml Mosmldep.sml
- rm -f Makefile.bak
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #if defined(__MWERKS__) || defined(WIN32)
+ #define MAXDOUBLE 1.7976931348623157081e+308
+ #else
+-#ifdef __FreeBSD__
++#if (defined(BSD) && BSD >= 199306)
+ #include <float.h>
+ #define MAXDOUBLE DBL_MAX
+ #else
diff --git a/lang/moscow_ml/patches/patch-ai b/lang/moscow_ml/patches/patch-ai
index 480ada4acc7..2ad11b0ff6c 100644
--- a/lang/moscow_ml/patches/patch-ai
+++ b/lang/moscow_ml/patches/patch-ai
@@ -1,19 +1,13 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 11:09:22 agc Exp $
+$NetBSD: patch-ai,v 1.3 1998/12/04 11:09:46 frueauf Exp $
---- runtime/fail.c.orig Fri Jul 4 08:52:34 1997
-+++ runtime/fail.c Mon Feb 16 21:31:37 1998
-@@ -1,7 +1,14 @@
- /* Raising exceptions from C. */
+--- toolssrc/Makefile.orig Tue Sep 23 07:52:11 1997
++++ toolssrc/Makefile Thu Dec 3 03:10:56 1998
+@@ -34,7 +34,7 @@
+ rm -f cutdeps mosmldep
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #if defined(__MWERKS__) || defined(__CYGWIN32__)
- #define MAXDOUBLE 1.7976931348623157081e+308
-+#elif (defined(BSD) && BSD >= 199306)
-+#include <float.h>
-+#define MAXDOUBLE DBL_MAX
- #else
- #include <values.h>
- #endif
+ install:
+- cp cutdeps mosmldep $(TOOLDIR)
++ ${INSTALL_DATA} cutdeps mosmldep $(TOOLDIR)
+
+ depend: Deplex.sml Deppars.sml Mosmldep.sml
+ rm -f Makefile.bak
diff --git a/lang/moscow_ml/patches/patch-aj b/lang/moscow_ml/patches/patch-aj
deleted file mode 100644
index badc05ea5d5..00000000000
--- a/lang/moscow_ml/patches/patch-aj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 11:09:22 agc Exp $
-
---- runtime/mosml.c.orig Sun Jul 27 15:35:09 1997
-+++ runtime/mosml.c Mon Feb 16 21:41:07 1998
-@@ -1,5 +1,13 @@
- /* Moscow SML primitives */
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD) && BSD >= 199306)
-+#define HAS_STRERROR
-+#endif
-+
- #include <math.h>
- #include <sys/time.h>
- #include <sys/times.h>
diff --git a/lang/moscow_ml/patches/patch-ak b/lang/moscow_ml/patches/patch-ak
deleted file mode 100644
index 1ab442c08d6..00000000000
--- a/lang/moscow_ml/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 11:09:22 agc Exp $
-
---- runtime/sys.c.orig Sun Jul 27 15:36:44 1997
-+++ runtime/sys.c Mon Feb 16 21:41:26 1998
-@@ -1,5 +1,13 @@
- /* Basic system calls */
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD) && BSD >= 199306)
-+#define HAS_STRERROR
-+#endif
-+
- #include <errno.h>
- #include <sys/types.h>
- #include <fcntl.h>
diff --git a/lang/moscow_ml/pkg/DESCR b/lang/moscow_ml/pkg/DESCR
index db08c0b0dd6..fa829dd9bff 100644
--- a/lang/moscow_ml/pkg/DESCR
+++ b/lang/moscow_ml/pkg/DESCR
@@ -1,7 +1,6 @@
This is Moscow ML, a version of Standard ML:
-The current version 1.42 of Moscow 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
diff --git a/lang/moscow_ml/pkg/PLIST b/lang/moscow_ml/pkg/PLIST
index 8d7e0973184..70f6a5a3f5e 100644
--- a/lang/moscow_ml/pkg/PLIST
+++ b/lang/moscow_ml/pkg/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 1998/02/17 10:18:37 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/12/04 11:09:46 frueauf Exp $
bin/camlrunm
bin/mosml
bin/mosmlc
bin/mosmllex
bin/mosmlyac
-lib/moscow_ml/README
lib/moscow_ml/Array.sig
lib/moscow_ml/Array.ui
lib/moscow_ml/Array.uo
@@ -50,9 +49,15 @@ lib/moscow_ml/Date.uo
lib/moscow_ml/Dynarray.sig
lib/moscow_ml/Dynarray.ui
lib/moscow_ml/Dynarray.uo
+lib/moscow_ml/Dynlib.sig
+lib/moscow_ml/Dynlib.ui
+lib/moscow_ml/Dynlib.uo
lib/moscow_ml/FileSys.sig
lib/moscow_ml/FileSys.ui
lib/moscow_ml/FileSys.uo
+lib/moscow_ml/Gdbm.sig
+lib/moscow_ml/Gdbm.ui
+lib/moscow_ml/Gdbm.uo
lib/moscow_ml/General.sig
lib/moscow_ml/Help.sig
lib/moscow_ml/Help.ui
@@ -117,12 +122,16 @@ lib/moscow_ml/Parsing.uo
lib/moscow_ml/Path.sig
lib/moscow_ml/Path.ui
lib/moscow_ml/Path.uo
+lib/moscow_ml/Polygdbm.sig
+lib/moscow_ml/Polygdbm.ui
+lib/moscow_ml/Polygdbm.uo
lib/moscow_ml/Polyhash.sig
lib/moscow_ml/Polyhash.ui
lib/moscow_ml/Polyhash.uo
lib/moscow_ml/Process.sig
lib/moscow_ml/Process.ui
lib/moscow_ml/Process.uo
+lib/moscow_ml/README
lib/moscow_ml/Random.sig
lib/moscow_ml/Random.ui
lib/moscow_ml/Random.uo
@@ -168,6 +177,9 @@ lib/moscow_ml/Timer.uo
lib/moscow_ml/Vector.sig
lib/moscow_ml/Vector.ui
lib/moscow_ml/Vector.uo
+lib/moscow_ml/Weak.sig
+lib/moscow_ml/Weak.ui
+lib/moscow_ml/Weak.uo
lib/moscow_ml/Word.sig
lib/moscow_ml/Word.ui
lib/moscow_ml/Word.uo
@@ -185,15 +197,79 @@ lib/moscow_ml/helpsigs.val
lib/moscow_ml/mosmlcmp
lib/moscow_ml/mosmllnk
lib/moscow_ml/mosmltop
-@dirrm lib/moscow_ml
libexec/moscow_ml/cutdeps
libexec/moscow_ml/mosmldep
-@dirrm libexec/moscow_ml
share/doc/moscow_ml/bugs
+share/doc/moscow_ml/copyrght.att
+share/doc/moscow_ml/copyrght.cl
+share/doc/moscow_ml/gpl2
share/doc/moscow_ml/manual.dvi
+share/doc/moscow_ml/mosmllib/Array.html
+share/doc/moscow_ml/mosmllib/Array2.html
+share/doc/moscow_ml/mosmllib/Arraysort.html
+share/doc/moscow_ml/mosmllib/BasicIO.html
+share/doc/moscow_ml/mosmllib/BinIO.html
+share/doc/moscow_ml/mosmllib/Binarymap.html
+share/doc/moscow_ml/mosmllib/Binaryset.html
+share/doc/moscow_ml/mosmllib/Bool.html
+share/doc/moscow_ml/mosmllib/Byte.html
+share/doc/moscow_ml/mosmllib/Char.html
+share/doc/moscow_ml/mosmllib/CharArray.html
+share/doc/moscow_ml/mosmllib/CharVector.html
+share/doc/moscow_ml/mosmllib/CommandLine.html
+share/doc/moscow_ml/mosmllib/Date.html
+share/doc/moscow_ml/mosmllib/Dynarray.html
+share/doc/moscow_ml/mosmllib/Dynlib.html
+share/doc/moscow_ml/mosmllib/FileSys.html
+share/doc/moscow_ml/mosmllib/Gdbm.html
+share/doc/moscow_ml/mosmllib/General.html
+share/doc/moscow_ml/mosmllib/Help.html
+share/doc/moscow_ml/mosmllib/Int.html
+share/doc/moscow_ml/mosmllib/Intmap.html
+share/doc/moscow_ml/mosmllib/Intset.html
+share/doc/moscow_ml/mosmllib/Lexing.html
+share/doc/moscow_ml/mosmllib/List.html
+share/doc/moscow_ml/mosmllib/ListPair.html
+share/doc/moscow_ml/mosmllib/Listsort.html
+share/doc/moscow_ml/mosmllib/Location.html
+share/doc/moscow_ml/mosmllib/Math.html
+share/doc/moscow_ml/mosmllib/Meta.html
+share/doc/moscow_ml/mosmllib/Mosml.html
+share/doc/moscow_ml/mosmllib/Mosmlcgi.html
+share/doc/moscow_ml/mosmllib/NJ93.html
+share/doc/moscow_ml/mosmllib/Nonstdio.html
+share/doc/moscow_ml/mosmllib/OS.html
+share/doc/moscow_ml/mosmllib/Option.html
+share/doc/moscow_ml/mosmllib/PP.html
+share/doc/moscow_ml/mosmllib/Parsing.html
+share/doc/moscow_ml/mosmllib/Path.html
+share/doc/moscow_ml/mosmllib/Polygdbm.html
+share/doc/moscow_ml/mosmllib/Polyhash.html
+share/doc/moscow_ml/mosmllib/Process.html
+share/doc/moscow_ml/mosmllib/Random.html
+share/doc/moscow_ml/mosmllib/Real.html
+share/doc/moscow_ml/mosmllib/SML90.html
+share/doc/moscow_ml/mosmllib/Splaymap.html
+share/doc/moscow_ml/mosmllib/Splayset.html
+share/doc/moscow_ml/mosmllib/Splaytree.html
+share/doc/moscow_ml/mosmllib/String.html
+share/doc/moscow_ml/mosmllib/StringCvt.html
+share/doc/moscow_ml/mosmllib/Substring.html
+share/doc/moscow_ml/mosmllib/Susp.html
+share/doc/moscow_ml/mosmllib/TextIO.html
+share/doc/moscow_ml/mosmllib/Time.html
+share/doc/moscow_ml/mosmllib/Timer.html
+share/doc/moscow_ml/mosmllib/Vector.html
+share/doc/moscow_ml/mosmllib/Weak.html
+share/doc/moscow_ml/mosmllib/Word.html
+share/doc/moscow_ml/mosmllib/Word8.html
+share/doc/moscow_ml/mosmllib/Word8Array.html
+share/doc/moscow_ml/mosmllib/Word8Vector.html
+share/doc/moscow_ml/mosmllib/idIndex.html
+share/doc/moscow_ml/mosmllib/index.html
share/doc/moscow_ml/mosmlref.dvi
+share/doc/moscow_ml/recomp
share/doc/moscow_ml/releases.txt
-@dirrm share/doc/moscow_ml
share/examples/moscow_ml/Makefile
share/examples/moscow_ml/README
share/examples/moscow_ml/calc/Lexer.lex
@@ -209,16 +285,23 @@ share/examples/moscow_ml/cgi/cgiex2.sml
share/examples/moscow_ml/cgi/cgitest.sml
share/examples/moscow_ml/cgi/htmlform.html
share/examples/moscow_ml/cgi/upload.html
+share/examples/moscow_ml/helpsigs/Asynt.sml
share/examples/moscow_ml/helpsigs/Database.sig
share/examples/moscow_ml/helpsigs/Database.sml
+share/examples/moscow_ml/helpsigs/Hasht.sig
+share/examples/moscow_ml/helpsigs/Hasht.sml
share/examples/moscow_ml/helpsigs/Htmlsigs.sig
share/examples/moscow_ml/helpsigs/Htmlsigs.sml
share/examples/moscow_ml/helpsigs/Lexer.lex
share/examples/moscow_ml/helpsigs/Makefile
share/examples/moscow_ml/helpsigs/Parser.grm
+share/examples/moscow_ml/helpsigs/Parser.output
share/examples/moscow_ml/helpsigs/Parsspec.sml
share/examples/moscow_ml/helpsigs/Printbase.sml
share/examples/moscow_ml/helpsigs/README
+share/examples/moscow_ml/helpsigs/Stack.sig
+share/examples/moscow_ml/helpsigs/Stack.sml
+share/examples/moscow_ml/helpsigs/htmlsigs/.keep_me
share/examples/moscow_ml/helpsigs/makebase.sml
share/examples/moscow_ml/lexyacc/Data.sml
share/examples/moscow_ml/lexyacc/Lexer.lex
@@ -250,6 +333,21 @@ share/examples/moscow_ml/mls/Makefile
share/examples/moscow_ml/mls/mls.sml
share/examples/moscow_ml/pretty/Makefile
share/examples/moscow_ml/pretty/ppexpr.sml
+share/examples/moscow_ml/small/README
+share/examples/moscow_ml/small/countperms.sml
+share/examples/moscow_ml/small/countqueens.sml
+share/examples/moscow_ml/small/perms.sml
+share/examples/moscow_ml/small/queens.sml
+share/examples/moscow_ml/small/roman.sml
+share/examples/moscow_ml/small/subsets.sml
+share/examples/moscow_ml/small/subsum.sml
+share/examples/moscow_ml/weak/Makefile
+share/examples/moscow_ml/weak/README
+share/examples/moscow_ml/weak/hashcons.sml
+@dirrm lib/moscow_ml
+@dirrm libexec/moscow_ml
+@dirrm share/doc/moscow_ml/mosmllib
+@dirrm share/doc/moscow_ml
@dirrm share/examples/moscow_ml/calc
@dirrm share/examples/moscow_ml/cgi
@dirrm share/examples/moscow_ml/helpsigs/htmlsigs
@@ -259,4 +357,6 @@ share/examples/moscow_ml/pretty/ppexpr.sml
@dirrm share/examples/moscow_ml/manual
@dirrm share/examples/moscow_ml/mls
@dirrm share/examples/moscow_ml/pretty
+@dirrm share/examples/moscow_ml/small
+@dirrm share/examples/moscow_ml/weak
@dirrm share/examples/moscow_ml