Update to ocaml 3.02 --- from bk@rt.fm

This commit is contained in:
angelos 2001-08-22 00:32:00 +00:00
parent 8c166e368e
commit 9b86df13e9
5 changed files with 89 additions and 42 deletions

View File

@ -1,13 +1,15 @@
# $OpenBSD: Makefile,v 1.15 2001/07/27 05:06:43 pvalchev Exp $
# $OpenBSD: Makefile,v 1.16 2001/08/22 00:32:00 angelos Exp $
COMMENT= "ML language based on complete class-based objective system"
DISTNAME= ocaml-3.00
DISTNAME= ocaml-3.02
CATEGORIES= lang
NEED_VERSION= 1.402
NEED_VERSION= 1.440
MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/
DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES}
HOMEPAGE= http://www.ocaml.org/
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,6 +1,6 @@
MD5 (ocaml-3.00-refman.html.tar.gz) = 785ac165cc61ee8413a67399a3a2002e
MD5 (ocaml-3.00.tar.gz) = 7156d619d8e2aea430e0df9b1bab1b52
RMD160 (ocaml-3.00-refman.html.tar.gz) = 0e7a9e837555fb55f83632a074468900b64c1e2b
RMD160 (ocaml-3.00.tar.gz) = b9a11f220cd6b3fc562023cc7fa5875034872658
SHA1 (ocaml-3.00-refman.html.tar.gz) = 2a4b5135eb007dcf4d1935bd36a79b9d125239d1
SHA1 (ocaml-3.00.tar.gz) = 8254b3ef50a8a4428fc71ead4a4f7461164d0519
MD5 (ocaml-3.02-refman.html.tar.gz) = b2aeaa11f3ba48d59deb3fe1693606d4
MD5 (ocaml-3.02.tar.gz) = 2184258b41d3975648a4ebbb615c5046
RMD160 (ocaml-3.02-refman.html.tar.gz) = edd5f28aacb8c12cda04e8ec13723c636d5e35bc
RMD160 (ocaml-3.02.tar.gz) = cd9def60ac59bedf06fbe2b2474837b024c65055
SHA1 (ocaml-3.02-refman.html.tar.gz) = bf1455fdb5c517a773ccc0837df0eb8ac2afdef2
SHA1 (ocaml-3.02.tar.gz) = 02784423a68a74db1e4bcc71e1a563b4f62b838c

View File

@ -1,6 +1,6 @@
--- yacc/main.c.orig Wed Nov 17 19:59:05 1999
+++ yacc/main.c Tue Mar 7 22:35:27 2000
@@ -51,6 +51,14 @@ char *text_file_name;
--- yacc/main.c.orig Sun Aug 19 21:38:43 2001
+++ yacc/main.c Sun Aug 19 21:52:36 2001
@@ -51,6 +51,14 @@
char *union_file_name;
char *verbose_file_name;
@ -12,10 +12,10 @@
+int action_fd = -1, entry_fd = -1, text_fd = -1, union_fd = -1;
+#endif
+
FILE *action_file; /* a temp file, used to save actions associated */
/* with rules until the parser is written */
FILE *action_file; /* a temp file, used to save actions associated */
/* with rules until the parser is written */
FILE *entry_file;
@@ -89,16 +97,29 @@ char *rassoc;
@@ -89,16 +97,29 @@
short **derives;
char *nullable;
@ -29,13 +29,13 @@
{
+#ifdef HAVE_MKSTEMP
+ if (action_fd != -1)
+ unlink(action_file_name);
+ unlink(action_file_name);
+ if (entry_fd != -1)
+ unlink(entry_file_name);
+ unlink(entry_file_name);
+ if (text_fd != -1)
+ unlink(text_file_name);
+ unlink(text_file_name);
+ if (union_fd != -1)
+ unlink(union_file_name);
+ unlink(union_file_name);
+#else
if (action_file) { fclose(action_file); unlink(action_file_name); }
if (entry_file) { fclose(entry_file); unlink(entry_file_name); }
@ -45,23 +45,23 @@
if (output_file && k > 0) {
fclose(output_file); unlink(output_file_name);
}
@@ -283,11 +304,26 @@ void create_file_names(void)
@@ -283,11 +304,26 @@
union_file_name[len + 5] = 'u';
#ifndef NO_UNIX
+#ifdef HAVE_MKSTEMP
+ action_fd = mkstemp(action_file_name);
+ if (action_fd == -1)
+ open_error(action_file_name);
+ open_error(action_file_name);
+ entry_fd = mkstemp(entry_file_name);
+ if (entry_fd == -1)
+ open_error(entry_file_name);
+ if (entry_fd == -1)
+ open_error(entry_file_name);
+ text_fd = mkstemp(text_file_name);
+ if (text_fd == -1)
+ open_error(text_file_name);
+ open_error(text_file_name);
+ union_fd = mkstemp(union_file_name);
+ if (union_fd == -1)
+ open_error(union_file_name);
+ open_error(union_file_name);
+#else
mktemp(action_file_name);
mktemp(entry_file_name);
@ -72,8 +72,8 @@
len = strlen(file_prefix);
@@ -328,15 +364,27 @@ void open_files(void)
open_error(input_file_name);
@@ -328,15 +364,27 @@
open_error(input_file_name);
}
+#ifdef HAVE_MKSTEMP
@ -82,7 +82,7 @@
action_file = fopen(action_file_name, "w");
+#endif
if (action_file == 0)
open_error(action_file_name);
open_error(action_file_name);
+#ifdef HAVE_MKSTEMP
+ entry_file = fdopen(entry_fd, "w");
@ -90,7 +90,7 @@
entry_file = fopen(entry_file_name, "w");
+#endif
if (entry_file == 0)
open_error(entry_file_name);
open_error(entry_file_name);
+#ifdef HAVE_MKSTEMP
+ text_file = fdopen(text_fd, "w");
@ -98,17 +98,17 @@
text_file = fopen(text_file_name, "w");
+#endif
if (text_file == 0)
open_error(text_file_name);
open_error(text_file_name);
@@ -352,7 +400,11 @@ void open_files(void)
defines_file = fopen(defines_file_name, "w");
if (defines_file == 0)
open_error(defines_file_name);
@@ -352,7 +400,11 @@
defines_file = fopen(defines_file_name, "w");
if (defines_file == 0)
open_error(defines_file_name);
+#ifdef HAVE_MKSTEMP
+ union_file = fdopen(union_fd, "w");
+ union_file = fdopen(union_fd, "w");
+#else
union_file = fopen(union_file_name, "w");
union_file = fopen(union_file_name, "w");
+#endif
if (union_file == 0)
open_error(union_file_name);
if (union_file == 0)
open_error(union_file_name);
}

View File

@ -15,5 +15,6 @@ The other compiler generates high-performance native code for a number
of processors. Compilation takes longer and generates bigger code, but
the generated programs deliver excellent performance (better than
Standard ML of New Jersey 1.08 on our tests), while retaining the
moderate memory requirements of the bytecode compiler. The native-code
compiler currently runs on the following platforms:
moderate memory requirements of the bytecode compiler.
WWW: ${HOMEPAGE}

View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2000/05/22 15:41:35 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2001/08/22 00:32:01 angelos Exp $
bin/labltk
bin/ocaml
bin/ocaml299to3
bin/ocamlbrowser
bin/ocamlc
bin/ocamlcp
@ -95,6 +94,8 @@ lib/ocaml/graphics.cma
lib/ocaml/graphics.cmi
lib/ocaml/graphics.cmxa
lib/ocaml/graphics.mli
lib/ocaml/graphicsX11.cmi
lib/ocaml/graphicsX11.mli
lib/ocaml/hashtbl.cmi
lib/ocaml/hashtbl.cmx
lib/ocaml/hashtbl.ml
@ -109,25 +110,42 @@ lib/ocaml/int64.ml
lib/ocaml/int64.mli
lib/ocaml/int_misc.cmx
lib/ocaml/labltk/balloon.cmi
lib/ocaml/labltk/balloon.cmx
lib/ocaml/labltk/balloon.mli
lib/ocaml/labltk/bell.cmi
lib/ocaml/labltk/bell.cmx
lib/ocaml/labltk/button.cmi
lib/ocaml/labltk/button.cmx
lib/ocaml/labltk/canvas.cmi
lib/ocaml/labltk/canvas.cmx
lib/ocaml/labltk/checkbutton.cmi
lib/ocaml/labltk/checkbutton.cmx
lib/ocaml/labltk/clipboard.cmi
lib/ocaml/labltk/clipboard.cmx
lib/ocaml/labltk/dialog.cmi
lib/ocaml/labltk/dialog.cmx
lib/ocaml/labltk/entry.cmi
lib/ocaml/labltk/entry.cmx
lib/ocaml/labltk/fileevent.cmi
lib/ocaml/labltk/fileevent.cmx
lib/ocaml/labltk/fileevent.mli
lib/ocaml/labltk/fileselect.cmi
lib/ocaml/labltk/fileselect.cmx
lib/ocaml/labltk/fileselect.mli
lib/ocaml/labltk/focus.cmi
lib/ocaml/labltk/focus.cmx
lib/ocaml/labltk/frame.cmi
lib/ocaml/labltk/frame.cmx
lib/ocaml/labltk/grab.cmi
lib/ocaml/labltk/grab.cmx
lib/ocaml/labltk/grid.cmi
lib/ocaml/labltk/grid.cmx
lib/ocaml/labltk/imagebitmap.cmi
lib/ocaml/labltk/imagebitmap.cmx
lib/ocaml/labltk/imagephoto.cmi
lib/ocaml/labltk/imagephoto.cmx
lib/ocaml/labltk/label.cmi
lib/ocaml/labltk/label.cmx
lib/ocaml/labltk/labltk.a
lib/ocaml/labltk/labltk.cma
lib/ocaml/labltk/labltk.cmxa
@ -137,33 +155,57 @@ lib/ocaml/labltk/libjpf.cma
lib/ocaml/labltk/libjpf.cmxa
lib/ocaml/labltk/liblabltk41.a
lib/ocaml/labltk/listbox.cmi
lib/ocaml/labltk/listbox.cmx
lib/ocaml/labltk/menu.cmi
lib/ocaml/labltk/menu.cmx
lib/ocaml/labltk/menubutton.cmi
lib/ocaml/labltk/menubutton.cmx
lib/ocaml/labltk/message.cmi
lib/ocaml/labltk/message.cmx
lib/ocaml/labltk/option.cmi
lib/ocaml/labltk/option.cmx
lib/ocaml/labltk/optionmenu.cmi
lib/ocaml/labltk/optionmenu.cmx
lib/ocaml/labltk/pack.cmi
lib/ocaml/labltk/pack.cmx
lib/ocaml/labltk/palette.cmi
lib/ocaml/labltk/palette.cmx
lib/ocaml/labltk/place.cmi
lib/ocaml/labltk/place.cmx
lib/ocaml/labltk/protocol.cmi
lib/ocaml/labltk/protocol.cmx
lib/ocaml/labltk/protocol.mli
lib/ocaml/labltk/radiobutton.cmi
lib/ocaml/labltk/radiobutton.cmx
lib/ocaml/labltk/scale.cmi
lib/ocaml/labltk/scale.cmx
lib/ocaml/labltk/scrollbar.cmi
lib/ocaml/labltk/scrollbar.cmx
lib/ocaml/labltk/selection.cmi
lib/ocaml/labltk/selection.cmx
lib/ocaml/labltk/support.cmx
lib/ocaml/labltk/text.cmi
lib/ocaml/labltk/text.cmx
lib/ocaml/labltk/textvariable.cmi
lib/ocaml/labltk/textvariable.cmx
lib/ocaml/labltk/textvariable.mli
lib/ocaml/labltk/timer.cmi
lib/ocaml/labltk/timer.cmx
lib/ocaml/labltk/timer.mli
lib/ocaml/labltk/tk.cmi
lib/ocaml/labltk/tk.cmx
lib/ocaml/labltk/tkcompiler
lib/ocaml/labltk/tkwait.cmi
lib/ocaml/labltk/tkwait.cmx
lib/ocaml/labltk/toplevel.cmi
lib/ocaml/labltk/toplevel.cmx
lib/ocaml/labltk/widget.cmi
lib/ocaml/labltk/widget.cmx
lib/ocaml/labltk/widget.mli
lib/ocaml/labltk/winfo.cmi
lib/ocaml/labltk/winfo.cmx
lib/ocaml/labltk/wm.cmi
lib/ocaml/labltk/wm.cmx
lib/ocaml/lazy.cmi
lib/ocaml/lazy.cmx
lib/ocaml/lazy.ml
@ -297,6 +339,7 @@ lib/ocaml/threads/stdlib.cma
lib/ocaml/threads/thread.cmi
lib/ocaml/threads/threadUnix.cmi
lib/ocaml/threads/threads.cma
lib/ocaml/threads/unix.cma
lib/ocaml/topdirs.cmi
lib/ocaml/toplevellib.cma
lib/ocaml/toploop.cmi
@ -315,6 +358,7 @@ man/man1/ocaml.1
man/man1/ocamlc.1
man/man1/ocamlc.opt.1
man/man1/ocamlcp.1
man/man1/ocamldebug.1
man/man1/ocamldep.1
man/man1/ocamllex.1
man/man1/ocamlmktop.1