[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
ocaml update, please test
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: ocaml update, please test
- From: Nikolay Sturm <sturm_(_at_)_sec_(_dot_)_informatik_(_dot_)_tu-darmstadt_(_dot_)_de>
- Date: Tue, 30 Sep 2003 22:45:07 +0200
- Mail-followup-to: ports_(_at_)_openbsd_(_dot_)_org
- Organization: Fnord!
Hi!
Attached diff updates the ocaml port to ocaml 3.07. It would be great if
people could test this on alpha, sparc and macppc. If it successfully
builds a package, everything should be fine.
Note: Be sure to remove empty patchfiles after applying this diff!
Unfortunately this update breaks net/mldonkey and math/coq. If anyone
could provide fixes for those ports, this update might even get
committed. :)
bye,
Nikolay
--
OpenPGP: 0x2036A3A7 - 64E4 7D77 F5C0 EA47 A901 51EF 6E54 6E4F 2036 A3A7
"The XFS you see in the kernel is not SGI-XFS but the X Font Server."
some user on misc_(_at_)_openbsd_(_dot_)_org
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 22 Nov 2002 16:43:44 -0000 1.24
+++ Makefile 30 Sep 2003 20:35:41 -0000
@@ -2,7 +2,7 @@
COMMENT= "ML language based on complete class-based objective system"
-DISTNAME= ocaml-3.06
+DISTNAME= ocaml-3.07
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME}/
DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES}
@@ -11,25 +11,24 @@
MAINTAINER= Nikolay Sturm <sturm_(_at_)_openbsd_(_dot_)_org>
+# QPL/LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-
-CONFIGURE_STYLE= simple
-CONFIGURE_ARGS+=-tkdefs '-I${LOCALBASE}/include/tk8.3 -I${LOCALBASE}/include/tcl8.3'
-CONFIGURE_ARGS+=-tklibs -L${LOCALBASE}/lib
-CONFIGURE_ARGS+=-prefix ${PREFIX}
-CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}'
-CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
+CONFIGURE_STYLE=simple
+CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}' -prefix ${PREFIX} \
+ -tkdefs '-I${LOCALBASE}/include/tk8.3 -I${LOCALBASE}/include/tk8.3/generic -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tcl8.3/generic -DHAVE_LIMITS_H -DHAVE_UNISTD_H' \
+ -tklibs -L${LOCALBASE}/lib \
+ -x11include ${X11BASE}/include -x11lib ${X11BASE}/lib \
LIB_DEPENDS= tcl83.1.3::lang/tcl/8.3 \
tk83.1.3::x11/tk/8.3
# ocaml's configure script is too smart for its own good
-
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
+
USE_GMAKE= Yes
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc" || \
@@ -47,8 +46,10 @@
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml/html/libref
- @${INSTALL_DATA} ${WRKDIR}/htmlman/*.{html,gif} ${PREFIX}/share/doc/ocaml/html
- @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* ${PREFIX}/share/doc/ocaml/html/libref
+ @${INSTALL_DATA} ${WRKDIR}/htmlman/*.{html,gif} \
+ ${PREFIX}/share/doc/ocaml/html
+ @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \
+ ${PREFIX}/share/doc/ocaml/html/libref
@strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc
@${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocaml
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 25 Aug 2002 20:44:40 -0000 1.2
+++ distinfo 30 Sep 2003 20:35:41 -0000
@@ -1,6 +1,6 @@
-MD5 (ocaml-3.06-refman.html.tar.gz) = 2b555271d2630698fcd3a9b9acfd1440
-MD5 (ocaml-3.06.tar.gz) = 51530ed183b511ce19fed325c8ab1b43
-RMD160 (ocaml-3.06-refman.html.tar.gz) = df0ede67ee899a11b63ed23a4d2d4dc62ee70fa4
-RMD160 (ocaml-3.06.tar.gz) = 99094fc0bbbbdc258e0bb75cec77a1a2f90d1e2a
-SHA1 (ocaml-3.06-refman.html.tar.gz) = 6181a4fe68f4e346e0da27225f4862be7d18a554
-SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863
+MD5 (ocaml-3.07-refman.html.tar.gz) = 9ac1f7e9e381b95504f0e7868d9fbf52
+MD5 (ocaml-3.07.tar.gz) = 2dd038055f5e1350078ad81270411b78
+RMD160 (ocaml-3.07-refman.html.tar.gz) = c16c88d4b53220778f302e3f50afa771dbaad426
+RMD160 (ocaml-3.07.tar.gz) = 3e9e3f0c1a3a4afb40cf4f6a8b8958ca71539268
+SHA1 (ocaml-3.07-refman.html.tar.gz) = 888b62f7de6815a70e6fed7a44c1faaf4e1d8cf1
+SHA1 (ocaml-3.07.tar.gz) = 7a5ecdcbfcce8a507cf9c15ab993a6cead4f0589
Index: patches/patch-asmcomp_alpha_emit_mlp
===================================================================
RCS file: patches/patch-asmcomp_alpha_emit_mlp
diff -N patches/patch-asmcomp_alpha_emit_mlp
--- patches/patch-asmcomp_alpha_emit_mlp 11 Sep 2002 04:41:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-asmcomp_alpha_emit_mlp,v 1.1 2002/09/11 04:41:40 pvalchev Exp $
---- asmcomp/alpha/emit.mlp.orig Tue Sep 10 21:01:03 2002
-+++ asmcomp/alpha/emit.mlp Tue Sep 10 21:01:08 2002
-@@ -280,8 +280,8 @@ let emit_call_gc gc =
-
- let rdata_section =
- match Config.system with
-- "digital" | "openbsd" -> ".rdata"
-- | "linux" | "netbsd" | "freebsd" -> ".section .rodata"
-+ "digital" -> ".rdata"
-+ | "linux" | "openbsd" | "netbsd" | "freebsd" -> ".section .rodata"
- | _ -> assert false
-
- (* Names of various instructions *)
Index: patches/patch-asmrun_alpha_S
===================================================================
RCS file: patches/patch-asmrun_alpha_S
diff -N patches/patch-asmrun_alpha_S
--- patches/patch-asmrun_alpha_S 11 Sep 2002 04:41:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-asmrun_alpha_S,v 1.1 2002/09/11 04:41:40 pvalchev Exp $
---- asmrun/alpha.S.orig Tue Sep 10 21:01:35 2002
-+++ asmrun/alpha.S Tue Sep 10 21:01:53 2002
-@@ -426,7 +426,7 @@ $111: ldgp $gp, 0($27)
- br caml_c_call /* never returns */
- .end caml_array_bound_error
-
--#if defined(SYS_digital) || defined(SYS_openbsd)
-+#if defined(SYS_digital)
- .rdata
- #else
- .section .rodata
Index: patches/patch-camlp4_config_configure_batch
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-camlp4_config_configure_batch,v
retrieving revision 1.1
diff -u -r1.1 patch-camlp4_config_configure_batch
--- patches/patch-camlp4_config_configure_batch 25 Aug 2002 20:44:40 -0000 1.1
+++ patches/patch-camlp4_config_configure_batch 30 Sep 2003 20:35:41 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-camlp4_config_configure_batch,v 1.1 2002/08/25 20:44:40 naddy Exp $
---- camlp4/config/configure_batch.orig Tue Jul 23 16:11:49 2002
-+++ camlp4/config/configure_batch Sat Aug 17 19:39:08 2002
-@@ -92,12 +92,12 @@ case "$bindir" in
+--- camlp4/config/configure_batch.orig 2003-08-29 14:14:53.000000000 +0200
++++ camlp4/config/configure_batch 2003-09-29 22:56:20.000000000 +0200
+@@ -94,12 +94,12 @@ case "$bindir" in
*) echo "BINDIR=$bindir" >> Makefile.cnf;;
esac
case "$libdir" in
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- patches/patch-configure 12 Sep 2002 17:02:47 -0000 1.2
+++ patches/patch-configure 30 Sep 2003 20:35:41 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-configure,v 1.2 2002/09/12 17:02:47 pvalchev Exp $
---- configure.orig Wed Aug 7 14:45:00 2002
-+++ configure Wed Sep 11 08:46:17 2002
-@@ -528,6 +528,7 @@ case "$host" in
- rs6000-*-aix*) arch=power; model=rs6000; system=aix;;
+$OpenBSD$
+--- configure.orig 2003-09-29 23:08:30.000000000 +0200
++++ configure 2003-09-29 23:10:36.000000000 +0200
+@@ -555,6 +555,7 @@ case "$host" in
powerpc-*-aix*) arch=power; model=ppc; system=aix;;
powerpc-*-linux*) arch=power; model=ppc; system=elf;;
-+ macppc-*-*bsd*) arch=power; model=ppc; system=elf;;
+ powerpc-*-netbsd*) arch=power; model=ppc; system=bsd;;
++ macppc-*-openbsd*) arch=power; model=ppc; system=bsd;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;;
arm*-*-linux*) arch=arm; system=linux;;
-@@ -1325,7 +1326,7 @@ fi
+@@ -1411,7 +1412,7 @@ fi
(
cd ../../camlp4/config
Index: patches/patch-otherlibs_db_Makefile
===================================================================
RCS file: patches/patch-otherlibs_db_Makefile
diff -N patches/patch-otherlibs_db_Makefile
--- patches/patch-otherlibs_db_Makefile 14 Dec 2002 20:03:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-otherlibs_db_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
---- otherlibs/db/Makefile.orig Fri Dec 13 23:06:41 2002
-+++ otherlibs/db/Makefile Fri Dec 13 23:07:02 2002
-@@ -24,7 +24,7 @@ CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
- COMPFLAGS=-warn-error A
-
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CFLAGS=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- COBJS=dbstubs.o
-
- all: libmldb.a db.cmi db.cma
Index: patches/patch-otherlibs_labltk_tkanim_tkAnimGIF_c
===================================================================
RCS file: patches/patch-otherlibs_labltk_tkanim_tkAnimGIF_c
diff -N patches/patch-otherlibs_labltk_tkanim_tkAnimGIF_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-otherlibs_labltk_tkanim_tkAnimGIF_c 30 Sep 2003 20:35:41 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- otherlibs/labltk/tkanim/tkAnimGIF.c.orig 2003-09-30 15:37:45.000000000 +0200
++++ otherlibs/labltk/tkanim/tkAnimGIF.c 2003-09-30 15:39:09.000000000 +0200
+@@ -17,6 +17,7 @@
+ /* #define TKANIM_DEBUG */
+
+ #include <tk.h>
++#include <tkInt.h>
+ #include <string.h>
+
+ /*
Index: patches/patch-otherlibs_num_bignum_Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-otherlibs_num_bignum_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-otherlibs_num_bignum_Makefile
--- patches/patch-otherlibs_num_bignum_Makefile 14 Dec 2002 20:03:22 -0000 1.1
+++ patches/patch-otherlibs_num_bignum_Makefile 30 Sep 2003 20:35:41 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-otherlibs_num_bignum_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
---- otherlibs/num/bignum/Makefile.orig Fri Dec 13 23:07:56 2002
-+++ otherlibs/num/bignum/Makefile Fri Dec 13 23:08:05 2002
+--- otherlibs/num/bignum/Makefile.orig 2001-09-05 13:50:58.000000000 +0200
++++ otherlibs/num/bignum/Makefile 2003-09-30 15:36:42.000000000 +0200
@@ -11,7 +11,7 @@ RANLIBTEST=test -f /usr/bin/ranlib -o -f
LIB = libbignum.a
OBJECT = o/KerN.o o/bnInit.o o/bnMult.o o/bnDivide.o o/bnCmp.o o/bzf.o o/bz.o
Index: patches/patch-otherlibs_num_bignum_c_bn_bnDivide_c
===================================================================
RCS file: patches/patch-otherlibs_num_bignum_c_bn_bnDivide_c
diff -N patches/patch-otherlibs_num_bignum_c_bn_bnDivide_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-otherlibs_num_bignum_c_bn_bnDivide_c 30 Sep 2003 20:35:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- otherlibs/num/bignum/c/bn/bnDivide.c.orig 2003-09-30 16:32:08.000000000 +0200
++++ otherlibs/num/bignum/c/bn/bnDivide.c 2003-09-30 16:31:54.000000000 +0200
+@@ -16,7 +16,7 @@
+ static char copyright[]="@(#)bnDivide.c: copyright Digital Equipment Corporation & INRIA 1988, 1989, 1990\n";
+
+
+-static divide (nn, nl, dd, dl)
++static void divide (nn, nl, dd, dl)
+
+ BigNum nn, dd;
+ register BigNumLength nl, dl;
Index: patches/patch-otherlibs_num_bignum_c_bz_c
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-otherlibs_num_bignum_c_bz_c,v
retrieving revision 1.1
diff -u -r1.1 patch-otherlibs_num_bignum_c_bz_c
--- patches/patch-otherlibs_num_bignum_c_bz_c 15 Dec 2002 17:52:44 -0000 1.1
+++ patches/patch-otherlibs_num_bignum_c_bz_c 30 Sep 2003 20:35:41 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-otherlibs_num_bignum_c_bz_c,v 1.1 2002/12/15 17:52:44 sturm Exp $
---- otherlibs/num/bignum/c/bz.c.orig Sat Dec 14 04:01:25 2002
-+++ otherlibs/num/bignum/c/bz.c Sat Dec 14 04:01:47 2002
+--- otherlibs/num/bignum/c/bz.c.orig 1995-11-06 11:33:29.000000000 +0100
++++ otherlibs/num/bignum/c/bz.c 2003-09-30 15:36:42.000000000 +0200
@@ -23,6 +23,7 @@
#include <malloc.h>
#include <values.h>
@@ -9,11 +9,12 @@
#define NULL 0
#define max(a,b) (a<b ? b : a)
-@@ -43,6 +44,7 @@
+@@ -43,6 +44,8 @@
0)
extern char *malloc();
+extern size_t strlen();
++extern void free();
/*** copyright ***/
Index: patches/patch-otherlibs_str_Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-otherlibs_str_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-otherlibs_str_Makefile
--- patches/patch-otherlibs_str_Makefile 14 Dec 2002 20:03:22 -0000 1.1
+++ patches/patch-otherlibs_str_Makefile 30 Sep 2003 20:35:41 -0000
@@ -5,8 +5,8 @@
# Compilation options
CC=$(BYTECC)
--CFLAGS=-O -I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CFLAGS=-I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+-CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../ocamlcomp.sh
CAMLOPT=../../ocamlcompopt.sh
COMPFLAGS=-warn-error A
Index: patches/patch-otherlibs_str_regex-0_12_Makefile_in
===================================================================
RCS file: patches/patch-otherlibs_str_regex-0_12_Makefile_in
diff -N patches/patch-otherlibs_str_regex-0_12_Makefile_in
--- patches/patch-otherlibs_str_regex-0_12_Makefile_in 14 Dec 2002 20:03:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-otherlibs_str_regex-0_12_Makefile_in,v 1.1 2002/12/14 20:03:22 sturm Exp $
---- otherlibs/str/regex-0.12/Makefile.in.orig Fri Dec 13 23:31:14 2002
-+++ otherlibs/str/regex-0.12/Makefile.in Fri Dec 13 23:32:53 2002
-@@ -29,7 +29,7 @@ version = 0.12
- CPPFLAGS =
-
- # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
--CFLAGS = -O
-+# CFLAGS = -O
-
- # Ditto for LDFLAGS and LOADLIBES.
- LDFLAGS =
Index: patches/patch-otherlibs_str_regex-0_12_regex_c
===================================================================
RCS file: patches/patch-otherlibs_str_regex-0_12_regex_c
diff -N patches/patch-otherlibs_str_regex-0_12_regex_c
--- patches/patch-otherlibs_str_regex-0_12_regex_c 15 Dec 2002 17:52:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-otherlibs_str_regex-0_12_regex_c,v 1.1 2002/12/15 17:52:44 sturm Exp $
---- otherlibs/str/regex-0.12/regex.c.orig Sat Dec 14 01:53:58 2002
-+++ otherlibs/str/regex-0.12/regex.c Sat Dec 14 02:06:22 2002
-@@ -3776,7 +3776,7 @@ re_match_2 (bufp, string1, size1, string
- regstart[r] = old_regstart[r];
-
- /* xx why this test? */
-- if ((int) old_regend[r] >= (int) regstart[r])
-+ if (old_regend[r] >= regstart[r])
- regend[r] = old_regend[r];
- }
- }
Index: patches/patch-otherlibs_systhreads_posix_c
===================================================================
RCS file: patches/patch-otherlibs_systhreads_posix_c
diff -N patches/patch-otherlibs_systhreads_posix_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-otherlibs_systhreads_posix_c 30 Sep 2003 20:35:41 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- otherlibs/systhreads/posix.c.orig 2003-09-30 15:27:09.000000000 +0200
++++ otherlibs/systhreads/posix.c 2003-09-30 15:28:31.000000000 +0200
+@@ -25,9 +25,8 @@
+ #endif
+ #include <signal.h>
+ #include <sys/time.h>
+-#ifdef __linux__
++#include <sys/types.h>
+ #include <unistd.h>
+-#endif
+ #include "alloc.h"
+ #include "backtrace.h"
+ #include "callback.h"
Index: patches/patch-tools_checkstack_c
===================================================================
RCS file: patches/patch-tools_checkstack_c
diff -N patches/patch-tools_checkstack_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_checkstack_c 30 Sep 2003 20:35:41 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- tools/checkstack.c.orig 2003-09-30 15:41:37.000000000 +0200
++++ tools/checkstack.c 2003-09-30 15:42:58.000000000 +0200
+@@ -34,7 +34,8 @@ int main(int argc, char ** argv)
+ "Under sh, bash, zsh: ulimit -s %lu\n"
+ "Under csh, tcsh: limit stacksize %lu\n\n",
+ (unsigned long) (limit.rlim_cur / 1024),
+- MINSTACKBYTES / 1024, MINSTACKBYTES / 1024);
++ (unsigned long) (MINSTACKBYTES / 1024),
++ (unsigned long) (MINSTACKBYTES / 1024));
+ exit (3);
+ }
+ exit (0);
Index: patches/patch-yacc_main_c
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-yacc_main_c,v
retrieving revision 1.2
diff -u -r1.2 patch-yacc_main_c
--- patches/patch-yacc_main_c 25 Aug 2002 20:44:40 -0000 1.2
+++ patches/patch-yacc_main_c 30 Sep 2003 20:35:41 -0000
@@ -1,6 +1,6 @@
---- yacc/main.c.orig Thu Jul 12 14:54:23 2001
-+++ yacc/main.c Mon Aug 12 21:33:04 2002
-@@ -51,6 +51,14 @@ char *text_file_name;
+--- yacc/main.c.orig 2003-09-03 15:25:48.000000000 +0200
++++ yacc/main.c 2003-09-29 22:56:21.000000000 +0200
+@@ -52,6 +52,14 @@ char *text_file_name;
char *union_file_name;
char *verbose_file_name;
@@ -15,7 +15,7 @@
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;
+@@ -90,16 +98,29 @@ char *rassoc;
short **derives;
char *nullable;
@@ -45,7 +45,7 @@
if (output_file && k > 0) {
fclose(output_file); unlink(output_file_name);
}
-@@ -283,11 +304,26 @@ void create_file_names(void)
+@@ -292,11 +313,26 @@ void create_file_names(void)
union_file_name[len + 5] = 'u';
#ifndef NO_UNIX
@@ -72,7 +72,7 @@
len = strlen(file_prefix);
-@@ -328,15 +364,27 @@ void open_files(void)
+@@ -337,15 +373,27 @@ void open_files(void)
open_error(input_file_name);
}
@@ -100,7 +100,7 @@
if (text_file == 0)
open_error(text_file_name);
-@@ -352,7 +400,11 @@ void open_files(void)
+@@ -361,7 +409,11 @@ void open_files(void)
defines_file = fopen(defines_file_name, "w");
if (defines_file == 0)
open_error(defines_file_name);
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR 22 Aug 2001 00:32:01 -0000 1.2
+++ pkg/DESCR 30 Sep 2003 20:35:41 -0000
@@ -16,5 +16,3 @@
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.
-
-WWW: ${HOMEPAGE}
Index: pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.native
--- pkg/PFRAG.native 16 Sep 2002 18:55:04 -0000 1.1
+++ pkg/PFRAG.native 30 Sep 2003 20:35:42 -0000
@@ -2,22 +2,31 @@
bin/camlp4o.opt
bin/camlp4r.opt
bin/ocamlc.opt
+bin/ocamldep.opt
bin/ocamldoc.opt
bin/ocamllex.opt
bin/ocamlopt
bin/ocamlopt.opt
lib/ocaml/arg.cmx
+lib/ocaml/arg.p.cmx
lib/ocaml/arith_flags.cmx
lib/ocaml/arith_status.cmx
lib/ocaml/array.cmx
+lib/ocaml/array.p.cmx
lib/ocaml/arrayLabels.cmx
+lib/ocaml/arrayLabels.p.cmx
lib/ocaml/big_int.cmx
lib/ocaml/bigarray.a
lib/ocaml/bigarray.cmx
lib/ocaml/bigarray.cmxa
lib/ocaml/buffer.cmx
+lib/ocaml/buffer.p.cmx
lib/ocaml/callback.cmx
+lib/ocaml/callback.p.cmx
lib/ocaml/camlinternalOO.cmx
+lib/ocaml/camlinternalOO.p.cmx
+lib/ocaml/camlp4/camlp4.a
+lib/ocaml/camlp4/camlp4.cmxa
lib/ocaml/camlp4/extfold.cmx
lib/ocaml/camlp4/extfun.cmx
lib/ocaml/camlp4/fstream.cmx
@@ -25,26 +34,46 @@
lib/ocaml/camlp4/gramlib.a
lib/ocaml/camlp4/gramlib.cmxa
lib/ocaml/camlp4/grammar.cmx
+lib/ocaml/camlp4/odyl.a
+lib/ocaml/camlp4/odyl.cmxa
+lib/ocaml/camlp4/pa_r.cmx
+lib/ocaml/camlp4/pa_r.o
+lib/ocaml/camlp4/pa_rp.cmx
+lib/ocaml/camlp4/pa_rp.o
lib/ocaml/camlp4/plexer.cmx
+lib/ocaml/camlp4/pr_dump.cmx
+lib/ocaml/camlp4/pr_dump.o
lib/ocaml/camlp4/stdpp.cmx
lib/ocaml/camlp4/token.cmx
lib/ocaml/char.cmx
+lib/ocaml/char.p.cmx
lib/ocaml/complex.cmx
+lib/ocaml/complex.p.cmx
lib/ocaml/dbm.a
lib/ocaml/dbm.cmx
lib/ocaml/dbm.cmxa
lib/ocaml/digest.cmx
+lib/ocaml/digest.p.cmx
lib/ocaml/filename.cmx
+lib/ocaml/filename.p.cmx
lib/ocaml/format.cmx
+lib/ocaml/format.p.cmx
lib/ocaml/gc.cmx
+lib/ocaml/gc.p.cmx
lib/ocaml/genlex.cmx
+lib/ocaml/genlex.p.cmx
lib/ocaml/graphics.a
+lib/ocaml/graphics.cmx
lib/ocaml/graphics.cmxa
lib/ocaml/hashtbl.cmx
+lib/ocaml/hashtbl.p.cmx
lib/ocaml/int32.cmx
+lib/ocaml/int32.p.cmx
lib/ocaml/int64.cmx
+lib/ocaml/int64.p.cmx
lib/ocaml/int_misc.cmx
lib/ocaml/labelled.cmx
+lib/ocaml/labelled.p.cmx
lib/ocaml/labltk/balloon.cmx
lib/ocaml/labltk/bell.cmx
lib/ocaml/labltk/button.cmx
@@ -137,36 +166,58 @@
lib/ocaml/labltk/winfo.cmx
lib/ocaml/labltk/wm.cmx
lib/ocaml/lazy.cmx
+lib/ocaml/lazy.p.cmx
lib/ocaml/lexing.cmx
+lib/ocaml/lexing.p.cmx
lib/ocaml/libasmrun.a
lib/ocaml/libasmrunp.a
+lib/ocaml/libthreadsnat.a
lib/ocaml/list.cmx
+lib/ocaml/list.p.cmx
lib/ocaml/listLabels.cmx
+lib/ocaml/listLabels.p.cmx
lib/ocaml/map.cmx
+lib/ocaml/map.p.cmx
lib/ocaml/marshal.cmx
+lib/ocaml/marshal.p.cmx
lib/ocaml/moreLabels.cmx
+lib/ocaml/moreLabels.p.cmx
lib/ocaml/nat.cmx
lib/ocaml/nativeint.cmx
+lib/ocaml/nativeint.p.cmx
lib/ocaml/num.cmx
lib/ocaml/nums.a
lib/ocaml/nums.cmxa
lib/ocaml/obj.cmx
+lib/ocaml/obj.p.cmx
lib/ocaml/ocamldoc/odoc_info.a
lib/ocaml/ocamldoc/odoc_info.cmxa
lib/ocaml/ocamldoc/odoc_opt.cmi
lib/ocaml/oo.cmx
+lib/ocaml/oo.p.cmx
lib/ocaml/parsing.cmx
+lib/ocaml/parsing.p.cmx
lib/ocaml/pervasives.cmx
+lib/ocaml/pervasives.p.cmx
lib/ocaml/printexc.cmx
+lib/ocaml/printexc.p.cmx
lib/ocaml/printf.cmx
+lib/ocaml/printf.p.cmx
lib/ocaml/queue.cmx
+lib/ocaml/queue.p.cmx
lib/ocaml/random.cmx
+lib/ocaml/random.p.cmx
lib/ocaml/ratio.cmx
lib/ocaml/scanf.cmx
+lib/ocaml/scanf.p.cmx
lib/ocaml/set.cmx
+lib/ocaml/set.p.cmx
lib/ocaml/sort.cmx
+lib/ocaml/sort.p.cmx
lib/ocaml/stack.cmx
+lib/ocaml/stack.p.cmx
lib/ocaml/stdLabels.cmx
+lib/ocaml/stdLabels.p.cmx
lib/ocaml/std_exit.cmx
lib/ocaml/std_exit.o
lib/ocaml/std_exit.p.cmx
@@ -179,15 +230,27 @@
lib/ocaml/str.cmx
lib/ocaml/str.cmxa
lib/ocaml/stream.cmx
+lib/ocaml/stream.p.cmx
lib/ocaml/string.cmx
+lib/ocaml/string.p.cmx
lib/ocaml/stringLabels.cmx
+lib/ocaml/stringLabels.p.cmx
lib/ocaml/string_misc.cmx
lib/ocaml/sys.cmx
+lib/ocaml/sys.p.cmx
+lib/ocaml/threads/condition.cmx
+lib/ocaml/threads/event.cmx
+lib/ocaml/threads/mutex.cmx
+lib/ocaml/threads/thread.cmx
+lib/ocaml/threads/threadUnix.cmx
+lib/ocaml/threads/threads.a
+lib/ocaml/threads/threads.cmxa
lib/ocaml/unix.a
lib/ocaml/unix.cmx
lib/ocaml/unix.cmxa
lib/ocaml/unixLabels.cmx
lib/ocaml/weak.cmx
+lib/ocaml/weak.p.cmx
man/man1/camlp4o.opt.1
man/man1/camlp4r.opt.1
man/man1/ocamlc.opt.1
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 16 Sep 2002 18:54:37 -0000 1.10
+++ pkg/PLIST 30 Sep 2003 20:35:43 -0000
@@ -3,6 +3,7 @@
bin/camlp4
bin/camlp4o
bin/camlp4r
+bin/camlp4sch
bin/labltk
bin/mkcamlp4
bin/ocaml
@@ -52,6 +53,7 @@
lib/ocaml/caml/memory.h
lib/ocaml/caml/misc.h
lib/ocaml/caml/mlvalues.h
+lib/ocaml/caml/signals.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
lib/ocaml/camlinternalOO.cmi
@@ -63,7 +65,7 @@
lib/ocaml/camlp4/camlp4_top.cma
lib/ocaml/camlp4/camlp4o.cma
lib/ocaml/camlp4/camlp4r.cma
-lib/ocaml/camlp4/crc.cmo
+lib/ocaml/camlp4/camlp4sch.cma
lib/ocaml/camlp4/extfold.cmi
lib/ocaml/camlp4/extfold.mli
lib/ocaml/camlp4/extfun.cmi
@@ -81,6 +83,7 @@
lib/ocaml/camlp4/ocpp.cmo
lib/ocaml/camlp4/odyl.cma
lib/ocaml/camlp4/odyl.cmo
+lib/ocaml/camlp4/odyl_main.cmi
lib/ocaml/camlp4/pa_extend.cmi
lib/ocaml/camlp4/pa_extend.cmo
lib/ocaml/camlp4/pa_extend_m.cmo
@@ -88,19 +91,20 @@
lib/ocaml/camlp4/pa_extfun.cmo
lib/ocaml/camlp4/pa_format.cmo
lib/ocaml/camlp4/pa_fstream.cmo
-lib/ocaml/camlp4/pa_ifdef.cmi
lib/ocaml/camlp4/pa_ifdef.cmo
lib/ocaml/camlp4/pa_lefteval.cmo
lib/ocaml/camlp4/pa_lisp.cmo
+lib/ocaml/camlp4/pa_macro.cmi
+lib/ocaml/camlp4/pa_macro.cmo
lib/ocaml/camlp4/pa_o.cmi
lib/ocaml/camlp4/pa_o.cmo
-lib/ocaml/camlp4/pa_ocamllex.cma
lib/ocaml/camlp4/pa_olabl.cmo
lib/ocaml/camlp4/pa_oop.cmo
lib/ocaml/camlp4/pa_op.cmo
lib/ocaml/camlp4/pa_r.cmo
lib/ocaml/camlp4/pa_rp.cmo
lib/ocaml/camlp4/pa_ru.cmo
+lib/ocaml/camlp4/pa_scheme.cmo
lib/ocaml/camlp4/pa_sml.cmo
lib/ocaml/camlp4/pcaml.cmi
lib/ocaml/camlp4/pcaml.mli
@@ -115,6 +119,8 @@
lib/ocaml/camlp4/pr_op.cmo
lib/ocaml/camlp4/pr_r.cmo
lib/ocaml/camlp4/pr_rp.cmo
+lib/ocaml/camlp4/pr_scheme.cmo
+lib/ocaml/camlp4/pr_schemep.cmo
lib/ocaml/camlp4/q_MLast.cmo
lib/ocaml/camlp4/q_phony.cmo
lib/ocaml/camlp4/quotation.cmi
@@ -436,7 +442,6 @@
lib/ocaml/obj.ml
lib/ocaml/obj.mli
lib/ocaml/ocamldoc/ocamldoc.hva
-lib/ocaml/ocamldoc/ocamldoc.sty
lib/ocaml/ocamldoc/odoc.cmi
lib/ocaml/ocamldoc/odoc_analyse.cmi
lib/ocaml/ocamldoc/odoc_args.cmi
@@ -459,6 +464,7 @@
lib/ocaml/ocamldoc/odoc_info.mli
lib/ocaml/ocamldoc/odoc_inherit.cmi
lib/ocaml/ocamldoc/odoc_latex.cmi
+lib/ocaml/ocamldoc/odoc_latex_style.cmi
lib/ocaml/ocamldoc/odoc_lexer.cmi
lib/ocaml/ocamldoc/odoc_man.cmi
lib/ocaml/ocamldoc/odoc_merge.cmi
@@ -549,11 +555,9 @@
lib/ocaml/threads/condition.cmi
lib/ocaml/threads/event.cmi
lib/ocaml/threads/mutex.cmi
-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
@@ -564,6 +568,20 @@
lib/ocaml/unix.mli
lib/ocaml/unixLabels.cmi
lib/ocaml/unixLabels.mli
+lib/ocaml/vmthreads/condition.cmi
+lib/ocaml/vmthreads/condition.mli
+lib/ocaml/vmthreads/event.cmi
+lib/ocaml/vmthreads/event.mli
+lib/ocaml/vmthreads/libvmthreads.a
+lib/ocaml/vmthreads/mutex.cmi
+lib/ocaml/vmthreads/mutex.mli
+lib/ocaml/vmthreads/stdlib.cma
+lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.mli
+lib/ocaml/vmthreads/threadUnix.cmi
+lib/ocaml/vmthreads/threadUnix.mli
+lib/ocaml/vmthreads/threads.cma
+lib/ocaml/vmthreads/unix.cma
lib/ocaml/weak.cmi
lib/ocaml/weak.ml
lib/ocaml/weak.mli
@@ -582,85 +600,86 @@
man/man1/ocamlrun.1
man/man1/ocamlyacc.1
man/man1/ocpp.1
-man/mano/Arg.o
-man/mano/Array.o
-man/mano/ArrayLabels.o
-man/mano/Bigarray.Array1.o
-man/mano/Bigarray.Array2.o
-man/mano/Bigarray.Array3.o
-man/mano/Bigarray.Genarray.o
-man/mano/Bigarray.o
-man/mano/Buffer.o
-man/mano/Callback.o
-man/mano/CamlinternalOO.o
-man/mano/Char.o
-man/mano/Complex.o
-man/mano/Digest.o
-man/mano/Filename.o
-man/mano/Format.o
-man/mano/Gc.o
-man/mano/Genlex.o
-man/mano/Hashtbl.HashedType.o
-man/mano/Hashtbl.Make.o
-man/mano/Hashtbl.S.o
-man/mano/Hashtbl.o
-man/mano/Int32.o
-man/mano/Int64.o
-man/mano/Lazy.o
-man/mano/Lexing.o
-man/mano/List.o
-man/mano/ListLabels.o
-man/mano/Map.Make.o
-man/mano/Map.OrderedType.o
-man/mano/Map.S.o
-man/mano/Map.o
-man/mano/Marshal.o
-man/mano/MoreLabels.Hashtbl.HashedType.o
-man/mano/MoreLabels.Hashtbl.Make.o
-man/mano/MoreLabels.Hashtbl.S.o
-man/mano/MoreLabels.Hashtbl.o
-man/mano/MoreLabels.Map.Make.o
-man/mano/MoreLabels.Map.OrderedType.o
-man/mano/MoreLabels.Map.S.o
-man/mano/MoreLabels.Map.o
-man/mano/MoreLabels.Set.Make.o
-man/mano/MoreLabels.Set.OrderedType.o
-man/mano/MoreLabels.Set.S.o
-man/mano/MoreLabels.Set.o
-man/mano/MoreLabels.o
-man/mano/Nativeint.o
-man/mano/Num.o
-man/mano/Obj.o
-man/mano/Oo.o
-man/mano/Parsing.o
-man/mano/Pervasives.LargeFile.o
-man/mano/Pervasives.o
-man/mano/Printexc.o
-man/mano/Printf.o
-man/mano/Queue.o
-man/mano/Random.o
-man/mano/Scanf.Scanning.o
-man/mano/Scanf.o
-man/mano/Set.Make.o
-man/mano/Set.OrderedType.o
-man/mano/Set.S.o
-man/mano/Set.o
-man/mano/Sort.o
-man/mano/Stack.o
-man/mano/StdLabels.Array.o
-man/mano/StdLabels.List.o
-man/mano/StdLabels.String.o
-man/mano/StdLabels.o
-man/mano/Str.o
-man/mano/Stream.o
-man/mano/String.o
-man/mano/StringLabels.o
-man/mano/Sys.o
-man/mano/Unix.LargeFile.o
-man/mano/Unix.o
-man/mano/Weak.Make.o
-man/mano/Weak.S.o
-man/mano/Weak.o
+man/man3/Arg.3o
+man/man3/Array.3o
+man/man3/ArrayLabels.3o
+man/man3/Bigarray.3o
+man/man3/Bigarray.Array1.3o
+man/man3/Bigarray.Array2.3o
+man/man3/Bigarray.Array3.3o
+man/man3/Bigarray.Genarray.3o
+man/man3/Buffer.3o
+man/man3/Callback.3o
+man/man3/CamlinternalOO.3o
+man/man3/Char.3o
+man/man3/Complex.3o
+man/man3/Digest.3o
+man/man3/Filename.3o
+man/man3/Format.3o
+man/man3/Gc.3o
+man/man3/Genlex.3o
+man/man3/Hashtbl.3o
+man/man3/Hashtbl.HashedType.3o
+man/man3/Hashtbl.Make.3o
+man/man3/Hashtbl.S.3o
+man/man3/Int32.3o
+man/man3/Int64.3o
+man/man3/Lazy.3o
+man/man3/Lexing.3o
+man/man3/List.3o
+man/man3/ListLabels.3o
+man/man3/Map.3o
+man/man3/Map.Make.3o
+man/man3/Map.OrderedType.3o
+man/man3/Map.S.3o
+man/man3/Marshal.3o
+man/man3/MoreLabels.3o
+man/man3/MoreLabels.Hashtbl.3o
+man/man3/MoreLabels.Hashtbl.HashedType.3o
+man/man3/MoreLabels.Hashtbl.Make.3o
+man/man3/MoreLabels.Hashtbl.S.3o
+man/man3/MoreLabels.Map.3o
+man/man3/MoreLabels.Map.Make.3o
+man/man3/MoreLabels.Map.OrderedType.3o
+man/man3/MoreLabels.Map.S.3o
+man/man3/MoreLabels.Set.3o
+man/man3/MoreLabels.Set.Make.3o
+man/man3/MoreLabels.Set.OrderedType.3o
+man/man3/MoreLabels.Set.S.3o
+man/man3/Nativeint.3o
+man/man3/Num.3o
+man/man3/Obj.3o
+man/man3/Oo.3o
+man/man3/Parsing.3o
+man/man3/Pervasives.3o
+man/man3/Pervasives.LargeFile.3o
+man/man3/Printexc.3o
+man/man3/Printf.3o
+man/man3/Queue.3o
+man/man3/Random.3o
+man/man3/Random.State.3o
+man/man3/Scanf.3o
+man/man3/Scanf.Scanning.3o
+man/man3/Set.3o
+man/man3/Set.Make.3o
+man/man3/Set.OrderedType.3o
+man/man3/Set.S.3o
+man/man3/Sort.3o
+man/man3/Stack.3o
+man/man3/StdLabels.3o
+man/man3/StdLabels.Array.3o
+man/man3/StdLabels.List.3o
+man/man3/StdLabels.String.3o
+man/man3/Str.3o
+man/man3/Stream.3o
+man/man3/String.3o
+man/man3/StringLabels.3o
+man/man3/Sys.3o
+man/man3/Unix.3o
+man/man3/Unix.LargeFile.3o
+man/man3/Weak.3o
+man/man3/Weak.Make.3o
+man/man3/Weak.S.3o
share/doc/ocaml/LICENSE
share/doc/ocaml/html/contents_motif.gif
share/doc/ocaml/html/index.html
@@ -730,6 +749,7 @@
share/doc/ocaml/html/libref/Printexc.html
share/doc/ocaml/html/libref/Printf.html
share/doc/ocaml/html/libref/Queue.html
+share/doc/ocaml/html/libref/Random.State.html
share/doc/ocaml/html/libref/Random.html
share/doc/ocaml/html/libref/Scanf.Scanning.html
share/doc/ocaml/html/libref/Scanf.html
@@ -834,6 +854,7 @@
share/doc/ocaml/html/libref/type_Printexc.html
share/doc/ocaml/html/libref/type_Printf.html
share/doc/ocaml/html/libref/type_Queue.html
+share/doc/ocaml/html/libref/type_Random.State.html
share/doc/ocaml/html/libref/type_Random.html
share/doc/ocaml/html/libref/type_Scanf.Scanning.html
share/doc/ocaml/html/libref/type_Scanf.html
@@ -911,7 +932,7 @@
@dirrm share/doc/ocaml/html/libref
@dirrm share/doc/ocaml/html
@dirrm share/doc/ocaml
-_(_at_)_dirrm man/mano
+_(_at_)_dirrm lib/ocaml/vmthreads
@dirrm lib/ocaml/threads
@exec mkdir -p %D/lib/ocaml/stublibs
@dirrm lib/ocaml/stublibs
Visit your host, monkey.org