Index: Makefile =================================================================== RCS file: /cvs/ports/lang/ocaml/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- Makefile 16 Sep 2007 00:27:06 -0000 1.39 +++ Makefile 16 Feb 2009 00:51:09 -0000 @@ -4,11 +4,11 @@ COMMENT= ML language based on complete class-based objective system -BASENAME= ocaml-3.09 -DISTNAME= ${BASENAME}.3 -PKGNAME= ${DISTNAME}p0 +BASENAME= ocaml-3.11 +DISTNAME= ${BASENAME}.0 +PKGNAME= ${DISTNAME} CATEGORIES= lang -MASTER_SITES= http://caml.inria.fr/distrib/${BASENAME}/ +MASTER_SITES= http://caml.inria.fr/pub/distrib/${BASENAME}/ DOCFILES= ${BASENAME}-refman.html.tar.gz DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES} @@ -25,14 +25,14 @@ VMEM_WARNING= Yes CONFIGURE_STYLE= simple -CONFIGURE_ARGS+=-tkdefs '-I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4' +CONFIGURE_ARGS+=-tkdefs '-I${LOCALBASE}/include/tk8. -I${LOCALBASE}/include/tcl8.4' CONFIGURE_ARGS+=-tklibs -L${LOCALBASE}/lib CONFIGURE_ARGS+=-prefix ${PREFIX} CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}' CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib -LIB_DEPENDS= tcl84:tcl->=8.4,<8.5:lang/tcl/8.4 \ - tk84:tk->=8.4,<8.5:x11/tk/8.4 +LIB_DEPENDS= :tcl->=8.4:lang/tcl/8.5 \ + :tk->=8.4:x11/tk/8.5 # ocaml's configure script is too smart for its own good FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} @@ -46,7 +46,7 @@ ALL_TARGET= world bootstrap opt opt.opt PKG_ARGS+=-Dnative=1 .else -ALL_TARGET= world bootstrap +ALL_TARGET= world bootstrap ocamldoc PKG_ARGS+=-Dnative=0 .endif @@ -65,6 +65,6 @@ @${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocaml # PFRAG.native was generated from PLIST with: -# egrep '(ocamlopt|\.cmx|\.cmxa|\.o|\.opt|opt\.1|\.a|opt.cmi)$' +# egrep '(ocamlopt|\.cmx|\.cmxa|\.cmxs|\.opt|opt\.1|opt.cmi|\.native|\.o)$' .include Index: distinfo =================================================================== RCS file: /cvs/ports/lang/ocaml/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo 5 Apr 2007 16:20:00 -0000 1.9 +++ distinfo 16 Feb 2009 00:51:09 -0000 @@ -1,10 +1,10 @@ -MD5 (ocaml-3.09-refman.html.tar.gz) = sl6yEb+RvKpTaxLRJzHO7A== -MD5 (ocaml-3.09.3.tar.gz) = EakWUQB/cKLLTV7P4g+riQ== -RMD160 (ocaml-3.09-refman.html.tar.gz) = MFPfO6Xco79oS0unK+k+j3M8EW0= -RMD160 (ocaml-3.09.3.tar.gz) = CA9Yrk8h+zBsK+siSuVvWF43du0= -SHA1 (ocaml-3.09-refman.html.tar.gz) = hLeXHdHKJJ8mMENcbI3lSoaw2bY= -SHA1 (ocaml-3.09.3.tar.gz) = QB6g7V8UwtsIv6cEuK2azynwYg0= -SHA256 (ocaml-3.09-refman.html.tar.gz) = jkdmpJZKT5PvICvf+Qf4BtcZBtiNZgtIHkqV0RGuQEw= -SHA256 (ocaml-3.09.3.tar.gz) = g7zw4XRPi1x+DmmpQdtQDhWaFJLDTCJun3GND9KhAzE= -SIZE (ocaml-3.09-refman.html.tar.gz) = 484037 -SIZE (ocaml-3.09.3.tar.gz) = 2485013 +MD5 (ocaml-3.11-refman.html.tar.gz) = v7Ttlgl0FZ9CJAFKl5uvbQ== +MD5 (ocaml-3.11.0.tar.gz) = vhUgZr3wl2Hd8cMSkeXLkA== +RMD160 (ocaml-3.11-refman.html.tar.gz) = jXdjDuDD3Nrh7xQqWeuHYnHxwzU= +RMD160 (ocaml-3.11.0.tar.gz) = QQLWgQhurrF1A/ni1KxCpFEnaIk= +SHA1 (ocaml-3.11-refman.html.tar.gz) = lxWc89TqZNDKA/BJl/38AJgtIrA= +SHA1 (ocaml-3.11.0.tar.gz) = TpzQLxWiM0CGwVONFHjsapnJEcg= +SHA256 (ocaml-3.11-refman.html.tar.gz) = HGWzNMyxVa76Hl6TCpH4FthD034msn06A1HFcUkAWlw= +SHA256 (ocaml-3.11.0.tar.gz) = 7N1PhHOrDe5dOstcCjGkwd1qoSF5iVzxkD3Q9FXEOk8= +SIZE (ocaml-3.11-refman.html.tar.gz) = 536530 +SIZE (ocaml-3.11.0.tar.gz) = 2855506 Index: ocaml.port.mk =================================================================== RCS file: /cvs/ports/lang/ocaml/ocaml.port.mk,v retrieving revision 1.8 diff -u -r1.8 ocaml.port.mk --- ocaml.port.mk 26 Dec 2006 22:38:35 -0000 1.8 +++ ocaml.port.mk 16 Feb 2009 00:51:09 -0000 @@ -9,7 +9,7 @@ # PFRAG.foo-native -- nativecode files for FLAVOR == foo # PFRAG.no-foo-native -- nativecode files for FLAVOR != foo -OCAML_VERSION=3.09.3 +OCAML_VERSION=3.11.0 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "amd64" || \ Index: patches/patch-camlp4_config_configure_batch =================================================================== RCS file: patches/patch-camlp4_config_configure_batch diff -N patches/patch-camlp4_config_configure_batch --- patches/patch-camlp4_config_configure_batch 9 May 2005 13:50:41 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-camlp4_config_configure_batch,v 1.3 2005/05/09 13:50:41 avsm Exp $ ---- camlp4/config/configure_batch.orig Fri Jul 30 15:59:15 2004 -+++ camlp4/config/configure_batch Tue Oct 5 20:54:00 2004 -@@ -103,12 +103,12 @@ case "$bindir" in - *) echo "BINDIR=$bindir" >> Makefile.cnf;; - esac - case "$libdir" in -- "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf -- libdir="$prefix/lib/camlp4";; -+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile.cnf -+ libdir="$prefix/lib/ocaml";; - *) echo "LIBDIR=$libdir" >> Makefile.cnf;; - esac - case "$mandir" in -- "") echo 'MANDIR=$(PREFIX)/man/man1' >> Makefile.cnf -+ "") echo 'MANDIR=$(PREFIX)/man' >> Makefile.cnf - mandir="$prefix/man/man1";; - *) echo "MANDIR=$mandir" >> Makefile.cnf;; - esac Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/lang/ocaml/patches/patch-configure,v retrieving revision 1.10 diff -u -r1.10 patch-configure --- patches/patch-configure 8 Feb 2007 14:32:57 -0000 1.10 +++ patches/patch-configure 16 Feb 2009 00:51:09 -0000 @@ -1,36 +1,29 @@ -$OpenBSD: patch-configure,v 1.10 2007/02/08 14:32:57 avsm Exp $ ---- configure.orig Tue Dec 26 23:30:01 2006 -+++ configure Tue Dec 26 23:29:28 2006 -@@ -483,7 +483,7 @@ mksharedlibrpath='' - - if test $withsharedlibs = "yes"; then - case "$host" in -- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*) -+ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-gnu*) - sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared -o" - bytecclinkopts="$bytecclinkopts -Wl,-E" -@@ -566,6 +566,7 @@ case "$host" in - alpha*-*-freebsd*) arch=alpha; system=freebsd;; - alpha*-*-netbsd*) arch=alpha; system=netbsd;; - alpha*-*-openbsd*) arch=alpha; system=openbsd;; -+ amd64-*-openbsd*) arch=amd64; system=openbsd;; - sparc*-*-sunos4.*) arch=sparc; system=sunos;; - sparc*-*-solaris2.*) arch=sparc; system=solaris;; - sparc*-*-*bsd*) arch=sparc; system=bsd;; -@@ -586,9 +587,11 @@ case "$host" in - hppa*-*-gnu*) arch=hppa; system=gnu;; - powerpc-*-linux*) arch=power; model=ppc; system=elf;; - powerpc-*-netbsd*) arch=power; model=ppc; system=bsd;; -+ powerpc-*-openbsd*) arch=power; model=ppc; system=bsd;; +$OpenBSD$ +--- configure.orig Wed Dec 10 09:41:04 2008 ++++ configure Wed Dec 10 09:50:14 2008 +@@ -635,9 +635,12 @@ case "$host" in + powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; - powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;; + powerpc-*-darwin*) arch=power; system=rhapsody +- if $arch64; then model=ppc64; else model=ppc; fi;; ++ if $arch64; then model=ppc64; else ++ model=ppc; fi;; ++ powerpc-*-openbsd*) arch=power; model=ppc; system=bsd;; arm*-*-linux*) arch=arm; system=linux;; -+ zaurus*-*-openbsd*) arch=arm; system=openbsd;; arm*-*-gnu*) arch=arm; system=gnu;; ++ zaurus*-*-openbsd*) arch=arm; system=openbsd;; ia64-*-linux*) arch=ia64; system=linux;; ia64-*-gnu*) arch=ia64; system=gnu;; -@@ -664,9 +667,13 @@ esac + ia64-*-freebsd*) arch=ia64; system=freebsd;; +@@ -647,6 +650,7 @@ case "$host" in + x86_64-*-netbsd*) arch=amd64; system=netbsd;; + x86_64-*-openbsd*) arch=amd64; system=openbsd;; + x86_64-*-darwin9.5) arch=amd64; system=macosx;; ++ amd64-*-openbsd*) arch=amd64; system=openbsd;; + esac + + # Some platforms exist both in 32-bit and 64-bit variants, not distinguished +@@ -734,11 +738,15 @@ if test -n "$asppoption"; then aspp="$asppoption"; fi cc_profile='-pg' case "$arch,$model,$system" in alpha,*,digital) profiling='prof';; @@ -38,6 +31,8 @@ i386,*,linux_elf) profiling='prof';; i386,*,gnu) profiling='prof';; i386,*,bsd_elf) profiling='prof';; + amd64,*,macosx) profiling='prof';; + i386,*,macosx) profiling='prof';; + amd64,*,openbsd) profiling='prof';; + power,*,bsd) profiling='prof';; + sparc,*,bsd) profiling='prof';; Index: patches/patch-yacc_reader_c =================================================================== RCS file: /cvs/ports/lang/ocaml/patches/patch-yacc_reader_c,v retrieving revision 1.1 diff -u -r1.1 patch-yacc_reader_c --- patches/patch-yacc_reader_c 8 Feb 2007 14:32:57 -0000 1.1 +++ patches/patch-yacc_reader_c 16 Feb 2009 00:51:09 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-yacc_reader_c,v 1.1 2007/02/08 14:32:57 avsm Exp $ ---- yacc/reader.c.orig Fri Dec 29 21:32:48 2006 -+++ yacc/reader.c Fri Dec 29 21:36:44 2006 -@@ -163,6 +163,7 @@ char *substring (char *str, int start, i +--- yacc/reader.c.orig Thu Oct 6 07:34:51 2005 ++++ yacc/reader.c Thu Nov 27 22:42:14 2008 +@@ -163,6 +163,7 @@ char *substring (char *str, int start, int len) for (i = 0; i < len; i++){ buf[i] = str[start+i]; } Index: pkg/PFRAG.native =================================================================== RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v retrieving revision 1.7 diff -u -r1.7 PFRAG.native --- pkg/PFRAG.native 26 Dec 2006 22:07:18 -0000 1.7 +++ pkg/PFRAG.native 16 Feb 2009 00:51:09 -0000 @@ -1,12 +1,17 @@ @comment $OpenBSD: PFRAG.native,v 1.7 2006/12/26 22:07:18 avsm Exp $ -bin/camlp4o.opt -bin/camlp4r.opt -bin/ocamlc.opt -bin/ocamldep.opt -bin/ocamldoc.opt -bin/ocamllex.opt +@bin bin/camlp4o.opt +@bin bin/camlp4r.opt +@bin bin/ocamlc.opt +@bin bin/ocamldep.opt +@bin bin/ocamldoc.opt +@bin bin/ocamllex.opt +@bin bin/camlp4of.opt +@bin bin/camlp4oof.opt +@bin bin/camlp4orf.opt +@bin bin/camlp4rf.opt bin/ocamlopt -bin/ocamlopt.opt +@bin bin/ocamlbuild.native +@bin bin/ocamlopt.opt lib/ocaml/arg.cmx lib/ocaml/arg.p.cmx lib/ocaml/arith_flags.cmx @@ -27,96 +32,6 @@ lib/ocaml/camlinternalMod.p.cmx lib/ocaml/camlinternalOO.cmx lib/ocaml/camlinternalOO.p.cmx -lib/ocaml/camlp4/argl.cmi -lib/ocaml/camlp4/argl.cmo -lib/ocaml/camlp4/ast2pt.cmx -lib/ocaml/camlp4/ast2pt.o -lib/ocaml/camlp4/camlp4.cma -lib/ocaml/camlp4/extfold.o -lib/ocaml/camlp4/extfun.o -lib/ocaml/camlp4/fstream.o -lib/ocaml/camlp4/gramext.o -lib/ocaml/camlp4/grammar.o -lib/ocaml/camlp4/pa_o_fast.o -lib/ocaml/camlp4/pcaml.cmx -lib/ocaml/camlp4/pcaml.o -lib/ocaml/camlp4/plexer.o -lib/ocaml/camlp4/quotation.cmx -lib/ocaml/camlp4/quotation.o -lib/ocaml/camlp4/reloc.cmx -lib/ocaml/camlp4/reloc.o -lib/ocaml/camlp4/spretty.cmx -lib/ocaml/camlp4/spretty.o -lib/ocaml/camlp4/stdpp.o -lib/ocaml/camlp4/token.o -lib/ocaml/camlp4/argl.cmx -lib/ocaml/camlp4/argl.o -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 -lib/ocaml/camlp4/gramext.cmx -lib/ocaml/camlp4/gramlib.a -lib/ocaml/camlp4/gramlib.cmxa -lib/ocaml/camlp4/grammar.cmx -lib/ocaml/camlp4/odyl.a -lib/ocaml/camlp4/odyl.cmx -lib/ocaml/camlp4/odyl.cmxa -lib/ocaml/camlp4/odyl.o -lib/ocaml/camlp4/pa_extend.cmx -lib/ocaml/camlp4/pa_extend.o -lib/ocaml/camlp4/pa_extend_m.cmx -lib/ocaml/camlp4/pa_extend_m.o -lib/ocaml/camlp4/pa_extfold.cmx -lib/ocaml/camlp4/pa_extfold.o -lib/ocaml/camlp4/pa_extfun.cmx -lib/ocaml/camlp4/pa_extfun.o -lib/ocaml/camlp4/pa_fstream.cmx -lib/ocaml/camlp4/pa_fstream.o -lib/ocaml/camlp4/pa_ifdef.cmx -lib/ocaml/camlp4/pa_ifdef.o -lib/ocaml/camlp4/pa_macro.cmx -lib/ocaml/camlp4/pa_macro.o -lib/ocaml/camlp4/pa_o.cmx -lib/ocaml/camlp4/pa_o.o -lib/ocaml/camlp4/pa_o_fast.cmi -lib/ocaml/camlp4/pa_o_fast.cmx -lib/ocaml/camlp4/pa_oop.cmx -lib/ocaml/camlp4/pa_oop.o -lib/ocaml/camlp4/pa_op.cmx -lib/ocaml/camlp4/pa_op.o -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/pa_ru.cmx -lib/ocaml/camlp4/pa_ru.o -lib/ocaml/camlp4/plexer.cmx -lib/ocaml/camlp4/pr_depend.cmx -lib/ocaml/camlp4/pr_depend.o -lib/ocaml/camlp4/pr_dump.cmx -lib/ocaml/camlp4/pr_dump.o -lib/ocaml/camlp4/pr_extend.cmx -lib/ocaml/camlp4/pr_extend.o -lib/ocaml/camlp4/pr_extfun.cmx -lib/ocaml/camlp4/pr_extfun.o -lib/ocaml/camlp4/pr_null.cmx -lib/ocaml/camlp4/pr_null.o -lib/ocaml/camlp4/pr_o.cmx -lib/ocaml/camlp4/pr_o.o -lib/ocaml/camlp4/pr_op.cmx -lib/ocaml/camlp4/pr_op.o -lib/ocaml/camlp4/pr_r.cmx -lib/ocaml/camlp4/pr_r.o -lib/ocaml/camlp4/pr_rp.cmx -lib/ocaml/camlp4/pr_rp.o -lib/ocaml/camlp4/q_MLast.cmx -lib/ocaml/camlp4/q_MLast.o -lib/ocaml/camlp4/q_phony.cmx -lib/ocaml/camlp4/q_phony.o -lib/ocaml/camlp4/stdpp.cmx -lib/ocaml/camlp4/token.cmx lib/ocaml/char.cmx lib/ocaml/char.p.cmx lib/ocaml/complex.cmx @@ -327,8 +242,133 @@ lib/ocaml/unixLabels.cmx lib/ocaml/weak.cmx lib/ocaml/weak.p.cmx -@man man/man1/camlp4o.opt.1 -@man man/man1/camlp4r.opt.1 @man man/man1/ocamlc.opt.1 @man man/man1/ocamlopt.1 @man man/man1/ocamlopt.opt.1 +lib/ocaml/bigarray.cmxs +lib/ocaml/dbm.cmxs +lib/ocaml/graphics.cmxs +lib/ocaml/nums.cmxs +lib/ocaml/str.cmxs +lib/ocaml/unix.cmxs +lib/ocaml/camlp4/Camlp4Bin.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o +lib/ocaml/camlp4/Camlp4Top/Rprint.o +lib/ocaml/camlp4/Camlp4Top/Top.o +lib/ocaml/camlp4/camlp4prof.o +lib/ocaml/ocamlbuild/ocamlbuild.o +lib/ocaml/ocamlbuild/ocamlbuild_executor.o +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o +lib/ocaml/camlp4/camlp4fulllib.a +lib/ocaml/camlp4/camlp4lib.a +lib/ocaml/dynlink.a +lib/ocaml/ocamlbuild/ocamlbuildlib.a +@man man/man3/Arg.3o +@man man/man3/Array.3o +@man man/man3/ArrayLabels.3o +@man man/man3/Bigarray.3o +@man man/man3/Bigarray.Array1.3o +@man man/man3/Bigarray.Array2.3o +@man man/man3/Bigarray.Array3.3o +@man man/man3/Bigarray.Genarray.3o +@man man/man3/Buffer.3o +@man man/man3/Callback.3o +@man man/man3/CamlinternalLazy.3o +@man man/man3/CamlinternalMod.3o +@man man/man3/CamlinternalOO.3o +@man man/man3/Char.3o +@man man/man3/Complex.3o +@man man/man3/Digest.3o +@man man/man3/Filename.3o +@man man/man3/Format.3o +@man man/man3/Gc.3o +@man man/man3/Genlex.3o +@man man/man3/Hashtbl.3o +@man man/man3/Hashtbl.HashedType.3o +@man man/man3/Hashtbl.Make.3o +@man man/man3/Hashtbl.S.3o +@man man/man3/Int32.3o +@man man/man3/Int64.3o +@man man/man3/Lazy.3o +@man man/man3/Lexing.3o +@man man/man3/List.3o +@man man/man3/ListLabels.3o +@man man/man3/Map.3o +@man man/man3/Map.Make.3o +@man man/man3/Map.OrderedType.3o +@man man/man3/Map.S.3o +@man man/man3/Marshal.3o +@man man/man3/MoreLabels.3o +@man man/man3/MoreLabels.Hashtbl.3o +@man man/man3/MoreLabels.Hashtbl.HashedType.3o +@man man/man3/MoreLabels.Hashtbl.Make.3o +@man man/man3/MoreLabels.Hashtbl.S.3o +@man man/man3/MoreLabels.Map.3o +@man man/man3/MoreLabels.Map.Make.3o +@man man/man3/MoreLabels.Map.OrderedType.3o +@man man/man3/MoreLabels.Map.S.3o +@man man/man3/MoreLabels.Set.3o +@man man/man3/MoreLabels.Set.Make.3o +@man man/man3/MoreLabels.Set.OrderedType.3o +@man man/man3/MoreLabels.Set.S.3o +@man man/man3/Nativeint.3o +@man man/man3/Num.3o +@man man/man3/Obj.3o +@man man/man3/Oo.3o +@man man/man3/Parsing.3o +@man man/man3/Pervasives.3o +@man man/man3/Pervasives.LargeFile.3o +@man man/man3/Printexc.3o +@man man/man3/Printf.3o +@man man/man3/Queue.3o +@man man/man3/Random.3o +@man man/man3/Random.State.3o +@man man/man3/Scanf.3o +@man man/man3/Scanf.Scanning.3o +@man man/man3/Set.3o +@man man/man3/Set.Make.3o +@man man/man3/Set.OrderedType.3o +@man man/man3/Set.S.3o +@man man/man3/Sort.3o +@man man/man3/Stack.3o +@man man/man3/StdLabels.3o +@man man/man3/StdLabels.Array.3o +@man man/man3/StdLabels.List.3o +@man man/man3/StdLabels.String.3o +@man man/man3/Str.3o +@man man/man3/Stream.3o +@man man/man3/String.3o +@man man/man3/StringLabels.3o +@man man/man3/Sys.3o +@man man/man3/Unix.3o +@man man/man3/Unix.LargeFile.3o +@man man/man3/Weak.3o +@man man/man3/Weak.Make.3o +@man man/man3/Weak.S.3o Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.shared,v retrieving revision 1.1 diff -u -r1.1 PFRAG.shared --- pkg/PFRAG.shared 8 Feb 2007 14:32:57 -0000 1.1 +++ pkg/PFRAG.shared 16 Feb 2009 00:51:09 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PFRAG.shared,v 1.1 2007/02/08 14:32:57 avsm Exp $ +lib/ocaml/libcamlrun_shared.so lib/ocaml/stublibs/dllbigarray.so lib/ocaml/stublibs/dllgraphics.so lib/ocaml/stublibs/dlllabltk.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v retrieving revision 1.18 diff -u -r1.18 PLIST --- pkg/PLIST 8 Feb 2007 14:32:57 -0000 1.18 +++ pkg/PLIST 16 Feb 2009 00:51:09 -0000 @@ -1,12 +1,20 @@ @comment $OpenBSD: PLIST,v 1.18 2007/02/08 14:32:57 avsm Exp $ %%SHARED%% bin/camlp4 +bin/camlp4boot bin/camlp4o +bin/camlp4of +bin/camlp4oof +bin/camlp4orf +bin/camlp4prof bin/camlp4r +bin/camlp4rf bin/labltk bin/mkcamlp4 bin/ocaml bin/ocamlbrowser +@bin bin/ocamlbuild +bin/ocamlbuild.byte bin/ocamlc bin/ocamlcp bin/ocamldebug @@ -16,9 +24,8 @@ bin/ocamlmklib bin/ocamlmktop bin/ocamlprof -bin/ocamlrun -bin/ocamlyacc -bin/ocpp +@bin bin/ocamlrun +@bin bin/ocamlyacc lib/ocaml/ lib/ocaml/Makefile.config lib/ocaml/addlabels @@ -58,8 +65,12 @@ lib/ocaml/caml/mlvalues.h lib/ocaml/caml/printexc.h lib/ocaml/caml/signals.h +lib/ocaml/caml/unixsupport.h lib/ocaml/camlheader lib/ocaml/camlheader_ur +lib/ocaml/camlinternalLazy.cmi +lib/ocaml/camlinternalLazy.ml +lib/ocaml/camlinternalLazy.mli lib/ocaml/camlinternalMod.cmi lib/ocaml/camlinternalMod.ml lib/ocaml/camlinternalMod.mli @@ -67,82 +78,87 @@ lib/ocaml/camlinternalOO.ml lib/ocaml/camlinternalOO.mli lib/ocaml/camlp4/ -lib/ocaml/camlp4/ast2pt.cmi -lib/ocaml/camlp4/ast2pt.cmo -lib/ocaml/camlp4/ast2pt.mli -lib/ocaml/camlp4/camlp4_top.cma +lib/ocaml/camlp4/Camlp4.cmi +lib/ocaml/camlp4/Camlp4Bin.cmi +lib/ocaml/camlp4/Camlp4Bin.cmo +lib/ocaml/camlp4/Camlp4Filters/ +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo +lib/ocaml/camlp4/Camlp4Parsers/ +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo +lib/ocaml/camlp4/Camlp4Printers/ +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo +lib/ocaml/camlp4/Camlp4Top/ +lib/ocaml/camlp4/Camlp4Top.cmi +lib/ocaml/camlp4/Camlp4Top.cmo +lib/ocaml/camlp4/Camlp4Top/Rprint.cmi +lib/ocaml/camlp4/Camlp4Top/Rprint.cmo +lib/ocaml/camlp4/Camlp4Top/Top.cmi +lib/ocaml/camlp4/Camlp4Top/Top.cmo +lib/ocaml/camlp4/Camlp4_config.cmi +lib/ocaml/camlp4/Camlp4_import.cmi +lib/ocaml/camlp4/camlp4fulllib.cma +lib/ocaml/camlp4/camlp4lib.cma lib/ocaml/camlp4/camlp4o.cma +lib/ocaml/camlp4/camlp4of.cma +lib/ocaml/camlp4/camlp4oof.cma +lib/ocaml/camlp4/camlp4orf.cma +lib/ocaml/camlp4/camlp4prof.cmi +lib/ocaml/camlp4/camlp4prof.cmo lib/ocaml/camlp4/camlp4r.cma -lib/ocaml/camlp4/extfold.cmi -lib/ocaml/camlp4/extfold.cmo -lib/ocaml/camlp4/extfold.mli -lib/ocaml/camlp4/extfun.cmi -lib/ocaml/camlp4/extfun.cmo -lib/ocaml/camlp4/extfun.mli -lib/ocaml/camlp4/fstream.cmi -lib/ocaml/camlp4/fstream.cmo -lib/ocaml/camlp4/fstream.mli -lib/ocaml/camlp4/gramext.cmi -lib/ocaml/camlp4/gramext.cmo -lib/ocaml/camlp4/gramext.mli -lib/ocaml/camlp4/gramlib.cma -lib/ocaml/camlp4/grammar.cmi -lib/ocaml/camlp4/grammar.cmo -lib/ocaml/camlp4/grammar.mli -lib/ocaml/camlp4/mLast.cmi -lib/ocaml/camlp4/mLast.mli -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 -lib/ocaml/camlp4/pa_extfold.cmo -lib/ocaml/camlp4/pa_extfun.cmo -lib/ocaml/camlp4/pa_fstream.cmo -lib/ocaml/camlp4/pa_ifdef.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_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/pcaml.cmi -lib/ocaml/camlp4/pcaml.cmo -lib/ocaml/camlp4/pcaml.mli -lib/ocaml/camlp4/plexer.cmi -lib/ocaml/camlp4/plexer.cmo -lib/ocaml/camlp4/plexer.mli -lib/ocaml/camlp4/pr_depend.cmo -lib/ocaml/camlp4/pr_dump.cmo -lib/ocaml/camlp4/pr_extend.cmo -lib/ocaml/camlp4/pr_extfun.cmo -lib/ocaml/camlp4/pr_null.cmo -lib/ocaml/camlp4/pr_o.cmo -lib/ocaml/camlp4/pr_op.cmo -lib/ocaml/camlp4/pr_r.cmo -lib/ocaml/camlp4/pr_rp.cmo -lib/ocaml/camlp4/q_MLast.cmo -lib/ocaml/camlp4/q_phony.cmo -lib/ocaml/camlp4/quotation.cmi -lib/ocaml/camlp4/quotation.cmo -lib/ocaml/camlp4/quotation.mli -lib/ocaml/camlp4/reloc.cmi -lib/ocaml/camlp4/reloc.cmo -lib/ocaml/camlp4/reloc.mli -lib/ocaml/camlp4/spretty.cmi -lib/ocaml/camlp4/spretty.cmo -lib/ocaml/camlp4/spretty.mli -lib/ocaml/camlp4/stdpp.cmi -lib/ocaml/camlp4/stdpp.cmo -lib/ocaml/camlp4/stdpp.mli -lib/ocaml/camlp4/token.cmi -lib/ocaml/camlp4/token.cmo -lib/ocaml/camlp4/token.mli +lib/ocaml/camlp4/camlp4rf.cma lib/ocaml/char.cmi lib/ocaml/char.ml lib/ocaml/char.mli @@ -457,6 +473,15 @@ lib/ocaml/obj.cmi lib/ocaml/obj.ml lib/ocaml/obj.mli +lib/ocaml/ocamlbuild/ +lib/ocaml/ocamlbuild/ocamlbuild.cmo +lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi +lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo +lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi +lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo +lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamldoc/ lib/ocaml/ocamldoc/custom/ lib/ocaml/ocamldoc/ocamldoc.hva @@ -608,11 +633,8 @@ lib/ocaml/weak.cmi lib/ocaml/weak.ml lib/ocaml/weak.mli -@man man/man1/camlp4.1 -@man man/man1/camlp4o.1 -@man man/man1/camlp4r.1 -@man man/man1/mkcamlp4.1 @man man/man1/ocaml.1 +@man man/man1/ocamlbuild.1 @man man/man1/ocamlc.1 @man man/man1/ocamlcp.1 @man man/man1/ocamldebug.1 @@ -623,93 +645,14 @@ @man man/man1/ocamlprof.1 @man man/man1/ocamlrun.1 @man man/man1/ocamlyacc.1 -@man man/man1/ocpp.1 -@man man/man3/Arg.3o -@man man/man3/Array.3o -@man man/man3/ArrayLabels.3o -@man man/man3/Bigarray.3o -@man man/man3/Bigarray.Array1.3o -@man man/man3/Bigarray.Array2.3o -@man man/man3/Bigarray.Array3.3o -@man man/man3/Bigarray.Genarray.3o -@man man/man3/Buffer.3o -@man man/man3/Callback.3o -@man man/man3/CamlinternalMod.3o -@man man/man3/CamlinternalOO.3o -@man man/man3/Char.3o -@man man/man3/Complex.3o -@man man/man3/Digest.3o -@man man/man3/Filename.3o -@man man/man3/Format.3o -@man man/man3/Gc.3o -@man man/man3/Genlex.3o -@man man/man3/Hashtbl.3o -@man man/man3/Hashtbl.HashedType.3o -@man man/man3/Hashtbl.Make.3o -@man man/man3/Hashtbl.S.3o -@man man/man3/Int32.3o -@man man/man3/Int64.3o -@man man/man3/Lazy.3o -@man man/man3/Lexing.3o -@man man/man3/List.3o -@man man/man3/ListLabels.3o -@man man/man3/Map.3o -@man man/man3/Map.Make.3o -@man man/man3/Map.OrderedType.3o -@man man/man3/Map.S.3o -@man man/man3/Marshal.3o -@man man/man3/MoreLabels.3o -@man man/man3/MoreLabels.Hashtbl.3o -@man man/man3/MoreLabels.Hashtbl.HashedType.3o -@man man/man3/MoreLabels.Hashtbl.Make.3o -@man man/man3/MoreLabels.Hashtbl.S.3o -@man man/man3/MoreLabels.Map.3o -@man man/man3/MoreLabels.Map.Make.3o -@man man/man3/MoreLabels.Map.OrderedType.3o -@man man/man3/MoreLabels.Map.S.3o -@man man/man3/MoreLabels.Set.3o -@man man/man3/MoreLabels.Set.Make.3o -@man man/man3/MoreLabels.Set.OrderedType.3o -@man man/man3/MoreLabels.Set.S.3o -@man man/man3/Nativeint.3o -@man man/man3/Num.3o -@man man/man3/Obj.3o -@man man/man3/Oo.3o -@man man/man3/Parsing.3o -@man man/man3/Pervasives.3o -@man man/man3/Pervasives.LargeFile.3o -@man man/man3/Printexc.3o -@man man/man3/Printf.3o -@man man/man3/Queue.3o -@man man/man3/Random.3o -@man man/man3/Random.State.3o -@man man/man3/Scanf.3o -@man man/man3/Scanf.Scanning.3o -@man man/man3/Set.3o -@man man/man3/Set.Make.3o -@man man/man3/Set.OrderedType.3o -@man man/man3/Set.S.3o -@man man/man3/Sort.3o -@man man/man3/Stack.3o -@man man/man3/StdLabels.3o -@man man/man3/StdLabels.Array.3o -@man man/man3/StdLabels.List.3o -@man man/man3/StdLabels.String.3o -@man man/man3/Str.3o -@man man/man3/Stream.3o -@man man/man3/String.3o -@man man/man3/StringLabels.3o -@man man/man3/Sys.3o -@man man/man3/Unix.3o -@man man/man3/Unix.LargeFile.3o -@man man/man3/Weak.3o -@man man/man3/Weak.Make.3o -@man man/man3/Weak.S.3o share/doc/ocaml/ share/doc/ocaml/LICENSE share/doc/ocaml/html/ share/doc/ocaml/html/contents_motif.gif +share/doc/ocaml/html/expr.html share/doc/ocaml/html/index.html +share/doc/ocaml/html/language.html +share/doc/ocaml/html/lex.html share/doc/ocaml/html/libgraph.gif share/doc/ocaml/html/libref/ share/doc/ocaml/html/libref/Arg.html @@ -724,6 +667,7 @@ share/doc/ocaml/html/libref/Bigarray.html share/doc/ocaml/html/libref/Buffer.html share/doc/ocaml/html/libref/Callback.html +share/doc/ocaml/html/libref/CamlinternalLazy.html share/doc/ocaml/html/libref/CamlinternalMod.html share/doc/ocaml/html/libref/CamlinternalOO.html share/doc/ocaml/html/libref/Char.html @@ -799,6 +743,7 @@ share/doc/ocaml/html/libref/Sys.html share/doc/ocaml/html/libref/Thread.html share/doc/ocaml/html/libref/ThreadUnix.html +share/doc/ocaml/html/libref/Tk.html share/doc/ocaml/html/libref/Unix.LargeFile.html share/doc/ocaml/html/libref/Unix.html share/doc/ocaml/html/libref/UnixLabels.LargeFile.html @@ -829,6 +774,7 @@ share/doc/ocaml/html/libref/type_Bigarray.html share/doc/ocaml/html/libref/type_Buffer.html share/doc/ocaml/html/libref/type_Callback.html +share/doc/ocaml/html/libref/type_CamlinternalLazy.html share/doc/ocaml/html/libref/type_CamlinternalMod.html share/doc/ocaml/html/libref/type_CamlinternalOO.html share/doc/ocaml/html/libref/type_Char.html @@ -904,6 +850,7 @@ share/doc/ocaml/html/libref/type_Sys.html share/doc/ocaml/html/libref/type_Thread.html share/doc/ocaml/html/libref/type_ThreadUnix.html +share/doc/ocaml/html/libref/type_Tk.html share/doc/ocaml/html/libref/type_Unix.LargeFile.html share/doc/ocaml/html/libref/type_Unix.html share/doc/ocaml/html/libref/type_UnixLabels.LargeFile.html @@ -919,13 +866,10 @@ share/doc/ocaml/html/manual006.html share/doc/ocaml/html/manual007.html share/doc/ocaml/html/manual008.html -share/doc/ocaml/html/manual009.html share/doc/ocaml/html/manual010.html share/doc/ocaml/html/manual011.html share/doc/ocaml/html/manual012.html share/doc/ocaml/html/manual013.html -share/doc/ocaml/html/manual014.html -share/doc/ocaml/html/manual015.html share/doc/ocaml/html/manual016.html share/doc/ocaml/html/manual017.html share/doc/ocaml/html/manual018.html @@ -956,5 +900,7 @@ share/doc/ocaml/html/manual043.html share/doc/ocaml/html/manual044.html share/doc/ocaml/html/next_motif.gif +share/doc/ocaml/html/patterns.html share/doc/ocaml/html/previous_motif.gif %%native%% +share/doc/ocaml/html/types.html