summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authoradam <adam>2007-09-14 15:34:09 +0000
committeradam <adam>2007-09-14 15:34:09 +0000
commit68c0ee713635fb308370bdef3527ecc89f26565a (patch)
treebe5f9c9dcf1e470bbba28f8d2a6c818af47c8191 /lang/ocaml
parent8ae0c9608d102ca3bbf501b49e429d7633bb4652 (diff)
downloadpkgsrc-68c0ee713635fb308370bdef3527ecc89f26565a.tar.gz
Changes 3.10.0:
- New language features - New tools - Faster type-checking of functor applications. - Referencing an interface compiled with -rectypes from a module not compiled with -rectypes is now an error. - Revised the "fragile matching" warning. - Print a stack backtrace on an uncaught exception. - Stack overflow detection on MS Windows 32 bits. - Stack overflow detection on MacOS X PPC and Intel. - Intel/AMD 64 bits: generate position-independent code by default. - Fixed bug involving -for-pack and missing .cmx files. - Fixed bug causing duplication of literals. - C/Caml interface functions take "char const *" arguments instead of "char *" when appropriate. - Faster string comparisons (fast case if strings are ==). - Other
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/Makefile5
-rw-r--r--lang/ocaml/Makefile.common6
-rw-r--r--lang/ocaml/PLIST239
-rw-r--r--lang/ocaml/PLIST.opt111
-rw-r--r--lang/ocaml/distinfo43
-rw-r--r--lang/ocaml/patches/patch-aa6
-rw-r--r--lang/ocaml/patches/patch-ab4
-rw-r--r--lang/ocaml/patches/patch-ac8
-rw-r--r--lang/ocaml/patches/patch-ai17
-rw-r--r--lang/ocaml/patches/patch-ak32
-rw-r--r--lang/ocaml/patches/patch-al35
-rw-r--r--lang/ocaml/patches/patch-am29
-rw-r--r--lang/ocaml/patches/patch-an10
-rw-r--r--lang/ocaml/patches/patch-ao28
-rw-r--r--lang/ocaml/patches/patch-ap17
-rw-r--r--lang/ocaml/patches/patch-aq26
-rw-r--r--lang/ocaml/patches/patch-ar14
-rw-r--r--lang/ocaml/patches/patch-at53
-rw-r--r--lang/ocaml/patches/patch-au8
-rw-r--r--lang/ocaml/patches/patch-aw6
-rw-r--r--lang/ocaml/patches/patch-az8
-rw-r--r--lang/ocaml/patches/patch-ba8
-rw-r--r--lang/ocaml/patches/patch-bn6
-rw-r--r--lang/ocaml/patches/patch-bq8
-rw-r--r--lang/ocaml/patches/patch-bs12
-rw-r--r--lang/ocaml/patches/patch-bt8
-rw-r--r--lang/ocaml/patches/patch-bv15
27 files changed, 269 insertions, 493 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index da8080bf5d7..b20e7db9257 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/12/01 04:12:20 minskim Exp $
+# $NetBSD: Makefile,v 1.54 2007/09/14 15:34:09 adam Exp $
.include "Makefile.common"
@@ -12,7 +12,8 @@ BUILD_TARGET= world
###
# Stub libraries for functions missing from base system.
-.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
+.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || ${OPSYS} == "DragonFly" || \
+ ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
PLIST_SRC+= ${PKGDIR}/PLIST.stub
.endif
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 1c757de8e96..f84b6cf4a71 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.18 2006/10/22 05:49:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.19 2007/09/14 15:34:09 adam Exp $
-DISTNAME= ocaml-3.09.3
+DISTNAME= ocaml-3.10.0
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.09/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.10/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam@NetBSD.org
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 1dd0c28c098..b6facc8806e 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,9 +1,18 @@
-@comment $NetBSD: PLIST,v 1.16 2006/10/03 21:06:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/09/14 15:34:09 adam Exp $
bin/camlp4
+bin/camlp4boot
bin/camlp4o
+bin/camlp4of
+bin/camlp4oof
+bin/camlp4orf
+bin/camlp4prof
bin/camlp4r
+bin/camlp4rf
bin/mkcamlp4
bin/ocaml
+bin/ocamlbuild
+bin/ocamlbuild.byte
+bin/ocamlbuild.native
bin/ocamlc
bin/ocamlcp
bin/ocamldebug
@@ -15,7 +24,6 @@ bin/ocamlmktop
bin/ocamlprof
bin/ocamlrun
bin/ocamlyacc
-bin/ocpp
lib/ocaml/Makefile.config
lib/ocaml/addlabels
lib/ocaml/arg.cmi
@@ -53,6 +61,7 @@ lib/ocaml/caml/misc.h
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/camlinternalMod.cmi
@@ -61,104 +70,119 @@ lib/ocaml/camlinternalMod.mli
lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.ml
lib/ocaml/camlinternalOO.mli
-lib/ocaml/camlp4/argl.cmi
-lib/ocaml/camlp4/argl.cmo
-lib/ocaml/camlp4/ast2pt.cmi
-lib/ocaml/camlp4/ast2pt.cmo
-lib/ocaml/camlp4/ast2pt.cmx
-lib/ocaml/camlp4/ast2pt.mli
-lib/ocaml/camlp4/ast2pt.o
-lib/ocaml/camlp4/camlp4.cma
-lib/ocaml/camlp4/camlp4_top.cma
+lib/ocaml/camlp4/Camlp4.cmi
+lib/ocaml/camlp4/Camlp4Bin.cmi
+lib/ocaml/camlp4/Camlp4Bin.cmo
+lib/ocaml/camlp4/Camlp4Bin.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o
+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/Rprint.o
+lib/ocaml/camlp4/Camlp4Top/Top.cmi
+lib/ocaml/camlp4/Camlp4Top/Top.cmo
+lib/ocaml/camlp4/Camlp4Top/Top.o
+lib/ocaml/camlp4/Camlp4_config.cmi
+lib/ocaml/camlp4/camlp4fulllib.a
+lib/ocaml/camlp4/camlp4fulllib.cma
+lib/ocaml/camlp4/camlp4lib.a
+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/camlp4prof.o
lib/ocaml/camlp4/camlp4r.cma
-lib/ocaml/camlp4/extfold.cmi
-lib/ocaml/camlp4/extfold.cmo
-lib/ocaml/camlp4/extfold.mli
-lib/ocaml/camlp4/extfold.o
-lib/ocaml/camlp4/extfun.cmi
-lib/ocaml/camlp4/extfun.cmo
-lib/ocaml/camlp4/extfun.mli
-lib/ocaml/camlp4/extfun.o
-lib/ocaml/camlp4/fstream.cmi
-lib/ocaml/camlp4/fstream.cmo
-lib/ocaml/camlp4/fstream.mli
-lib/ocaml/camlp4/fstream.o
-lib/ocaml/camlp4/gramext.cmi
-lib/ocaml/camlp4/gramext.cmo
-lib/ocaml/camlp4/gramext.mli
-lib/ocaml/camlp4/gramext.o
-lib/ocaml/camlp4/gramlib.cma
-lib/ocaml/camlp4/grammar.cmi
-lib/ocaml/camlp4/grammar.cmo
-lib/ocaml/camlp4/grammar.mli
-lib/ocaml/camlp4/grammar.o
-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_o_fast.o
-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.cmx
-lib/ocaml/camlp4/pcaml.mli
-lib/ocaml/camlp4/pcaml.o
-lib/ocaml/camlp4/plexer.cmi
-lib/ocaml/camlp4/plexer.cmo
-lib/ocaml/camlp4/plexer.mli
-lib/ocaml/camlp4/plexer.o
-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.cmx
-lib/ocaml/camlp4/quotation.mli
-lib/ocaml/camlp4/quotation.o
-lib/ocaml/camlp4/reloc.cmi
-lib/ocaml/camlp4/reloc.cmo
-lib/ocaml/camlp4/reloc.cmx
-lib/ocaml/camlp4/reloc.mli
-lib/ocaml/camlp4/reloc.o
-lib/ocaml/camlp4/spretty.cmi
-lib/ocaml/camlp4/spretty.cmo
-lib/ocaml/camlp4/spretty.cmx
-lib/ocaml/camlp4/spretty.mli
-lib/ocaml/camlp4/spretty.o
-lib/ocaml/camlp4/stdpp.cmi
-lib/ocaml/camlp4/stdpp.cmo
-lib/ocaml/camlp4/stdpp.mli
-lib/ocaml/camlp4/stdpp.o
-lib/ocaml/camlp4/token.cmi
-lib/ocaml/camlp4/token.cmo
-lib/ocaml/camlp4/token.mli
-lib/ocaml/camlp4/token.o
+lib/ocaml/camlp4/camlp4rf.cma
lib/ocaml/char.cmi
lib/ocaml/char.ml
lib/ocaml/char.mli
@@ -240,6 +264,12 @@ lib/ocaml/nums.cma
lib/ocaml/obj.cmi
lib/ocaml/obj.ml
lib/ocaml/obj.mli
+lib/ocaml/ocamlbuild/ocamlbuild.cmo
+lib/ocaml/ocamlbuild/ocamlbuild.o
+lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuildlib.a
+lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamldoc/ocamldoc.hva
lib/ocaml/ocamldoc/odoc.cmi
lib/ocaml/ocamldoc/odoc_analyse.cmi
@@ -386,13 +416,8 @@ lib/ocaml/vmthreads/unix.cma
lib/ocaml/weak.cmi
lib/ocaml/weak.ml
lib/ocaml/weak.mli
-man/man1/camlp4.1
-man/man1/camlp4o.1
-man/man1/camlp4o.opt.1
-man/man1/camlp4r.1
-man/man1/camlp4r.opt.1
-man/man1/mkcamlp4.1
man/man1/ocaml.1
+man/man1/ocamlbuild.1
man/man1/ocamlc.1
man/man1/ocamlc.opt.1
man/man1/ocamlcp.1
@@ -406,7 +431,6 @@ man/man1/ocamlopt.opt.1
man/man1/ocamlprof.1
man/man1/ocamlrun.1
man/man1/ocamlyacc.1
-man/man1/ocpp.1
man/man3/Arg.3o
man/man3/Array.3o
man/man3/ArrayLabels.3o
@@ -492,6 +516,11 @@ man/man3/Weak.S.3o
@dirrm lib/ocaml/threads
@unexec ${RMDIR} %D/lib/ocaml/ocamldoc/custom 2>/dev/null || ${TRUE}
@dirrm lib/ocaml/ocamldoc
+@dirrm lib/ocaml/ocamlbuild
+@dirrm lib/ocaml/camlp4/Camlp4Top
+@dirrm lib/ocaml/camlp4/Camlp4Printers
+@dirrm lib/ocaml/camlp4/Camlp4Parsers
+@dirrm lib/ocaml/camlp4/Camlp4Filters
@dirrm lib/ocaml/camlp4
@dirrm lib/ocaml/caml
@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 6d65ab1280a..316c922bea4 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST.opt,v 1.12 2006/04/04 14:33:27 jlam Exp $
+@comment $NetBSD: PLIST.opt,v 1.13 2007/09/14 15:34:09 adam Exp $
bin/camlp4o.opt
+bin/camlp4of.opt
+bin/camlp4oof.opt
+bin/camlp4orf.opt
bin/camlp4r.opt
+bin/camlp4rf.opt
bin/ocamlc.opt
bin/ocamldep.opt
bin/ocamldoc.opt
@@ -20,74 +24,41 @@ lib/ocaml/buffer.cmx
lib/ocaml/callback.cmx
lib/ocaml/camlinternalMod.cmx
lib/ocaml/camlinternalOO.cmx
-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/camlp4/Camlp4Bin.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx
+lib/ocaml/camlp4/Camlp4Top/Rprint.cmx
+lib/ocaml/camlp4/Camlp4Top/Top.cmx
+lib/ocaml/camlp4/camlp4fulllib.cmxa
+lib/ocaml/camlp4/camlp4lib.cmxa
+lib/ocaml/camlp4/camlp4prof.cmx
lib/ocaml/char.cmx
lib/ocaml/complex.cmx
lib/ocaml/dbm.a
@@ -118,6 +89,8 @@ lib/ocaml/num.cmx
lib/ocaml/nums.a
lib/ocaml/nums.cmxa
lib/ocaml/obj.cmx
+lib/ocaml/ocamlbuild/ocamlbuild.cmx
+lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
lib/ocaml/ocamldoc/odoc_info.a
lib/ocaml/ocamldoc/odoc_info.cmxa
lib/ocaml/ocamldoc/odoc_opt.cmi
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 664cdfc6e3d..a79c45f1f32 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,32 +1,24 @@
-$NetBSD: distinfo,v 1.38 2007/01/06 00:11:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.39 2007/09/14 15:34:09 adam Exp $
-SHA1 (ocaml-3.09.3.tar.bz2) = 5d63c6e0d13463f85c0d5147d641d2bceef87d6b
-RMD160 (ocaml-3.09.3.tar.bz2) = fdc124218c556c62c897ee6720970279e2d5426b
-Size (ocaml-3.09.3.tar.bz2) = 2038617 bytes
-SHA1 (patch-aa) = def64fabecdb9517f37cf9f5b1a9e63270210029
-SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230
-SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
+SHA1 (ocaml-3.10.0.tar.bz2) = 5c7ee7dd5ac55bee2877ca0ace5ffb044df8efb5
+RMD160 (ocaml-3.10.0.tar.bz2) = 19615743230f0215135eb966f1f08a6a828f9aa4
+Size (ocaml-3.10.0.tar.bz2) = 2786012 bytes
+SHA1 (patch-aa) = 858f326fe4db7971a05b3b001c6aecc02ecb2903
+SHA1 (patch-ab) = 64ed5d08daff185cf6fd3baa89de496ae6e8246a
+SHA1 (patch-ac) = efe8290b394f40d6675fc9d57557c49ddafdb239
SHA1 (patch-ad) = f2c1dcc3c31db31e2484fdea1076692a63252a87
SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
-SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
-SHA1 (patch-ak) = b6515a2a554e5c2aedd2e7db815e1e9ad2ea5953
-SHA1 (patch-al) = cc3b9dff5a618ae377a1b104db3d5374230351f8
-SHA1 (patch-am) = 653e461ae0c7e409f55c870c20f184b6e21440b2
-SHA1 (patch-an) = 535dd56444e1bb4c1ca68898610b00208693d9f7
-SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
-SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
-SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
-SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = 65ceea8b756f823527dc9b41f3cf31ee8ce07a49
-SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
+SHA1 (patch-an) = 7a56338a19015b407cbfa8a328655e2bd035f8bf
+SHA1 (patch-at) = 0e7657ff41899864fba9db8bd330b790b31a24e8
+SHA1 (patch-au) = 2696bc59b08a0ef06157b77665588bcf26feb306
SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
-SHA1 (patch-aw) = 56a694053c43e27b9c4c3f21a9f51c2c0e5a8374
+SHA1 (patch-aw) = 9d8b75ebba957ff69e4a344400ba3d1c0adb3951
SHA1 (patch-ax) = 2419dffbf548837dc61e137032e06d33b1059976
SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
-SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
-SHA1 (patch-ba) = f9dfb3a88438145055f0caa25b7c6a9b5cb377c7
+SHA1 (patch-az) = 4870ed5960559a90aaaa5e2e881b546e6a5898ad
+SHA1 (patch-ba) = cff1d4e1942908f83fc55823f5c7d2105e11eea7
SHA1 (patch-bb) = d60cca088fa92cf15a4d46d53dd42ed84f851f9c
SHA1 (patch-bc) = 4aa365ca555e01955c7787588a4effeacca7b8b0
SHA1 (patch-bd) = 2ab20ead8779de1f2eb77d3504e89d182f39a63d
@@ -37,12 +29,11 @@ SHA1 (patch-bh) = 2f14629fa692aec79a280ed0f350fcf20076eecf
SHA1 (patch-bi) = fc2901a49279b35de3d0cd95f08f1942fa98ced8
SHA1 (patch-bk) = ed30ca7afe04ff89c7a5ef8384d37c4f68e9efe7
SHA1 (patch-bm) = e6d982368536708bd0d67da979d783fd92bf138d
-SHA1 (patch-bn) = e8970e19c8be0d8ec5fda67677a783b7ce82507b
+SHA1 (patch-bn) = 53611048a7153af0425d0e859294b29b007c3902
SHA1 (patch-bo) = 322c322336d44a0d9c0bd8f1582d56ff873bd7e4
SHA1 (patch-bp) = 45038c5900aefdb8d21b8c3d3b8798b45014bae2
-SHA1 (patch-bq) = 88ce7c503d9f6f5ebcc2f944c420aa1c01c3baee
+SHA1 (patch-bq) = f1e5e0c417a237ec972a33a3b5e0a2e37620036b
SHA1 (patch-br) = c26f18532d3756188eb9c79bf9a301e50a0ce84b
-SHA1 (patch-bs) = 56c068a9ea56abebed410d1e6024d6142ff67d1c
-SHA1 (patch-bt) = 5356511f0ed6d53232f474373edb594804a2eb4c
+SHA1 (patch-bs) = 8554ef37cdeac1998978adc74a9c709a84cccb92
+SHA1 (patch-bt) = a1b9034f3034712bbedab51aed430285ca02ee5e
SHA1 (patch-bu) = df80c076248e1ad1ab6eae195bda724ea354a55e
-SHA1 (patch-bv) = 09cb2036915784dfb2a4d2b971bf82eff81996b5
diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index 5328669f175..23103cd9842 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/10/03 21:06:25 adam Exp $
+$NetBSD: patch-aa,v 1.8 2007/09/14 15:34:10 adam Exp $
---- asmcomp/i386/emit.mlp.orig 2006-03-29 16:49:19.000000000 +0200
+--- asmcomp/i386/emit.mlp.orig 2007-03-07 10:14:29.000000000 +0100
+++ asmcomp/i386/emit.mlp
-@@ -835,7 +835,7 @@ let emit_profile () =
+@@ -860,7 +860,7 @@ let emit_profile () =
` movl %esp, %ebp\n`;
` pushl %ecx\n`;
` pushl %edx\n`;
diff --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab
index 174de108539..3925f0e671a 100644
--- a/lang/ocaml/patches/patch-ab
+++ b/lang/ocaml/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2007/09/14 15:34:10 adam Exp $
--- otherlibs/dbm/cldbm.c.orig 2003-07-08 08:50:31.000000000 -0500
+++ otherlibs/dbm/cldbm.c
@@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $
-#ifdef DBM_USES_GDBM_NDBM
-#include <gdbm-ndbm.h>
+#ifdef DBM_USES_DB
-+#include <db.h>
++#include <ndbm.h>
#else
#include <ndbm.h>
#endif
diff --git a/lang/ocaml/patches/patch-ac b/lang/ocaml/patches/patch-ac
index 24fbeacf619..c474fe7ff99 100644
--- a/lang/ocaml/patches/patch-ac
+++ b/lang/ocaml/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-ac,v 1.5 2007/09/14 15:34:10 adam Exp $
---- asmcomp/power/emit.mlp.orig 2004-10-14 15:39:35.000000000 +0100
-+++ asmcomp/power/emit.mlp 2004-10-14 15:41:11.000000000 +0100
-@@ -793,6 +793,30 @@
+--- asmcomp/power/emit.mlp.orig 2007-05-10 18:41:12.000000000 +0200
++++ asmcomp/power/emit.mlp
+@@ -825,6 +825,30 @@ let rec emit_all i =
emit_instr i None;
emit_all i.next
diff --git a/lang/ocaml/patches/patch-ai b/lang/ocaml/patches/patch-ai
deleted file mode 100644
index 55de5f28fd7..00000000000
--- a/lang/ocaml/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/04/22 09:18:36 tron Exp $
-
---- asmrun/i386.S.orig Fri Jun 7 11:49:36 2002
-+++ asmrun/i386.S Thu Apr 22 10:34:38 2004
-@@ -53,10 +53,10 @@
- #elif defined(SYS_bsd_elf)
- #define PROFILE_CAML \
- pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \
-- call .mcount; \
-+ call __mcount; \
- popl %edx; popl %ecx; popl %eax; popl %ebp
- #define PROFILE_C \
-- pushl %ebp; movl %esp, %ebp; call .mcount; popl %ebp
-+ pushl %ebp; movl %esp, %ebp; call __mcount; popl %ebp
- #endif
- #else
- #define PROFILE_CAML
diff --git a/lang/ocaml/patches/patch-ak b/lang/ocaml/patches/patch-ak
deleted file mode 100644
index e0efeaad0bd..00000000000
--- a/lang/ocaml/patches/patch-ak
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2006/01/16 09:41:48 adam Exp $
-
---- camlp4/etc/Makefile.orig 2004-11-30 19:57:03.000000000 +0100
-+++ camlp4/etc/Makefile
-@@ -74,18 +74,19 @@ depend:
- get_promote:
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
-- cp $(OBJS) "$(LIBDIR)/camlp4/."
-- cp $(INTF) "$(LIBDIR)/camlp4/."
-- cp camlp4o$(EXE) "$(BINDIR)/."
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ -${BSD_INSTALL_PROGRAM_DIR} "$(BINDIR)"
-+ ${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_DATA} $(INTF) "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_SCRIPT} camlp4o$(EXE) "$(BINDIR)/."
- if test -f camlp4o.opt; then \
-- cp camlp4o.opt "$(BINDIR)/camlp4o.opt$(EXE)"; \
-- cp $(OBJSX) "$(LIBDIR)/camlp4/."; \
-+ ${BSD_INSTALL_SCRIPT} camlp4o.opt "$(BINDIR)/camlp4o.opt$(EXE)"; \
-+ ${BSD_INSTALL_DATA} $(OBJSX) "$(LIBDIR)/camlp4/."; \
- for file in $(OBJSX); do \
-- cp "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
-+ ${BSD_INSTALL_DATA} "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
- done ; \
- fi
-- cp mkcamlp4.sh "$(BINDIR)/mkcamlp4"
-+ ${BSD_INSTALL_SCRIPT} mkcamlp4.sh "$(BINDIR)/mkcamlp4"
- chmod a+x "$(BINDIR)/mkcamlp4"
-
- pr_extend.cmo: pa_extfun.cmo
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
deleted file mode 100644
index 8ee37d75e7f..00000000000
--- a/lang/ocaml/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.6 2006/10/03 21:06:25 adam Exp $
-
---- camlp4/camlp4/Makefile.orig 2006-09-12 10:58:10.000000000 +0200
-+++ camlp4/camlp4/Makefile
-@@ -73,24 +73,24 @@ EXPORTED = mLast quotation ast2pt pcaml
- install:
- -$(MKDIR) "$(BINDIR)"
- -$(MKDIR) "$(LIBDIR)/camlp4"
-- cp $(CAMLP4) "$(BINDIR)/."
-+ ${BSD_INSTALL_SCRIPT} $(CAMLP4) "$(BINDIR)/."
- for ext in mli cmi cmo cmx o; do for mod in $(EXPORTED); do \
-- cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
-+ ${BSD_INSTALL_DATA} $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
- cp argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
- for f in argl.o argl.cmx; do \
- if test -r $$f ; then \
-- cp $$f "$(LIBDIR)/camlp4/." ; \
-+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
- fi ; \
- done
-- cp camlp4.cma $(LIBDIR)/camlp4/.
-+ ${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/.
- for f in camlp4.$(A) camlp4.p.$(A) ; do \
- if test -f $$f ; then \
-- cp $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
-+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
- fi ; \
- done
- for f in camlp4.cmxa camlp4.p.cmxa ; do \
- if test -f $$f ; then \
-- cp $$f "$(LIBDIR)/camlp4/." ; \
-+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
- fi ; \
- done
-
diff --git a/lang/ocaml/patches/patch-am b/lang/ocaml/patches/patch-am
deleted file mode 100644
index 65520166f2c..00000000000
--- a/lang/ocaml/patches/patch-am
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-am,v 1.5 2006/10/03 21:06:25 adam Exp $
-
---- camlp4/lib/Makefile.orig 2006-09-14 17:32:20.000000000 +0200
-+++ camlp4/lib/Makefile
-@@ -44,19 +44,19 @@ compare:
- done
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4"
-- cp $(TARGET) *.mli "$(LIBDIR)/camlp4/."
-- cp *.cmi *.cmo "$(LIBDIR)/camlp4/."
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ ${BSD_INSTALL_DATA} $(TARGET) *.mli "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_DATA} *.cmi *.cmo "$(LIBDIR)/camlp4/."
- test -f $(TARGET:.cma=.cmxa) && $(MAKE) installopt LIBDIR="$(LIBDIR)" || true
-
- installopt:
- for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx *.o ; do \
-- test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
-+ test -f $$f && ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." || true ; \
- done
- # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A))
- target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \
- if test -f $$target ; then \
-- cp $$target "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$target ) \
-+ ${BSD_INSTALL_DATA} $$target "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$target ) \
- fi
-
- include .depend
diff --git a/lang/ocaml/patches/patch-an b/lang/ocaml/patches/patch-an
index 66831b382e0..6ef9e624f6b 100644
--- a/lang/ocaml/patches/patch-an
+++ b/lang/ocaml/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-an,v 1.3 2007/09/14 15:34:11 adam Exp $
---- camlp4/man/Makefile.orig 2003-07-03 17:14:49.000000000 +0100
-+++ camlp4/man/Makefile 2004-10-12 22:28:52.000000000 +0100
-@@ -16,8 +16,8 @@
+--- camlp4/man/Makefile.orig 2006-06-29 10:12:44.000000000 +0200
++++ camlp4/man/Makefile
+@@ -9,8 +9,8 @@ include ../config/Makefile.base
- install:
+ install-local:
if test -n '$(MANDIR)'; then \
- $(MKDIR) $(MANDIR)/man1 ; \
- cp $(TARGET) $(MANDIR)/man1/. ; \
diff --git a/lang/ocaml/patches/patch-ao b/lang/ocaml/patches/patch-ao
deleted file mode 100644
index 2748838c32f..00000000000
--- a/lang/ocaml/patches/patch-ao
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/meta/Makefile.orig 2004-10-14 16:17:42.000000000 +0100
-+++ camlp4/meta/Makefile 2004-10-14 16:19:48.000000000 +0100
-@@ -43,15 +43,16 @@
- done
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
-- cp $(OBJS) "$(LIBDIR)/camlp4/."
-- cp pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/."
-- cp camlp4r$(EXE) "$(BINDIR)/."
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ -${BSD_INSTALL_PROGRAM_DIR} "$(BINDIR)"
-+ ${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_DATA} pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_SCRIPT} camlp4r$(EXE) "$(BINDIR)/."
- if test -f camlp4r.opt; then \
-- cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
-- cp $(OBJSX) "$(LIBDIR)/camlp4/."; \
-+ ${BSD_INSTALL_SCRIPT} camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
-+ ${BSD_INSTALL_DATA} $(OBJSX) "$(LIBDIR)/camlp4/."; \
- for file in $(OBJSX); do \
-- cp "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
-+ ${BSD_INSTALL_DATA} "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
- done ; \
- fi
-
diff --git a/lang/ocaml/patches/patch-ap b/lang/ocaml/patches/patch-ap
deleted file mode 100644
index 043869ccf9d..00000000000
--- a/lang/ocaml/patches/patch-ap
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/ocpp/Makefile.orig 2004-10-14 16:20:22.000000000 +0100
-+++ camlp4/ocpp/Makefile 2004-10-14 16:21:32.000000000 +0100
-@@ -18,8 +18,9 @@
- rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak ocpp$(EXE)
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
-- cp $(OBJS) "$(LIBDIR)/camlp4/."
-- cp ocpp$(EXE) "$(BINDIR)/."
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ -${BSD_INSTALL_DATA_DIR} "$(BINDIR)"
-+ ${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_SCRIPT} ocpp$(EXE) "$(BINDIR)/."
-
- depend:
diff --git a/lang/ocaml/patches/patch-aq b/lang/ocaml/patches/patch-aq
deleted file mode 100644
index 7304df87d4e..00000000000
--- a/lang/ocaml/patches/patch-aq
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/odyl/Makefile.orig 2004-10-15 15:13:11.000000000 +0100
-+++ camlp4/odyl/Makefile 2004-10-15 15:14:30.000000000 +0100
-@@ -66,16 +66,17 @@
- compare:
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
-- cp odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/.
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ -${BSD_INSTALL_DATA_DIR} "$(BINDIR)"
-+ ${BSD_INSTALL_DATA} odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/.
- for f in odyl.$(A) odyl.p.$(A) ; do \
- if test -f $$f ; then \
-- cp $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
-+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
- fi ; \
- done
- for f in odyl.cmx odyl.o odyl.p.cmx odyl.p.o odyl.cmxa odyl.p.cmxa ; do \
- if test -f $$f ; then \
-- cp $$f "$(LIBDIR)/camlp4/." ; \
-+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
- fi ; \
- done
-
diff --git a/lang/ocaml/patches/patch-ar b/lang/ocaml/patches/patch-ar
deleted file mode 100644
index 7b2c61ac088..00000000000
--- a/lang/ocaml/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/top/Makefile.orig 2004-10-15 15:15:30.000000000 +0100
-+++ camlp4/top/Makefile 2004-10-15 15:16:24.000000000 +0100
-@@ -42,7 +42,7 @@
- get_promote:
-
- install:
-- -$(MKDIR) "$(LIBDIR)/camlp4"
-- cp $(TARGET) "$(LIBDIR)/camlp4/."
-+ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+ ${BSD_INSTALL_DATA} $(TARGET) "$(LIBDIR)/camlp4/."
-
- include .depend
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 4c923d51a3e..b6feea61ceb 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,17 +1,17 @@
-$NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
+$NetBSD: patch-at,v 1.14 2007/09/14 15:34:12 adam Exp $
---- configure.orig 2006-03-30 05:00:19.000000000 -0500
+--- configure.orig 2007-05-03 14:49:56.000000000 +0200
+++ configure
-@@ -483,7 +483,7 @@ mksharedlibrpath=''
+@@ -488,7 +488,7 @@ mksharedlibrpath=''
if test $withsharedlibs = "yes"; then
case "$host" in
-- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*)
-+ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*|*-*-netbsd*|*-*-dragonfly*)
+- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*)
++ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly*)
sharedcccompopts="-fPIC"
mksharedlib="$bytecc -shared -o"
bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -567,16 +567,18 @@ case "$host" in
+@@ -572,16 +572,18 @@ case "$host" in
alpha*-*-netbsd*) arch=alpha; system=netbsd;;
alpha*-*-openbsd*) arch=alpha; system=openbsd;;
sparc*-*-sunos4.*) arch=sparc; system=sunos;;
@@ -31,15 +31,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
i[3456]86-*-darwin*) arch=i386; system=macosx;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
mips-*-irix6*) arch=mips; system=irix;;
-@@ -596,6 +598,7 @@ case "$host" in
- x86_64-*-linux*) arch=amd64; system=linux;;
- x86_64-*-gnu*) arch=amd64; system=gnu;;
- x86_64-*-freebsd*) arch=amd64; system=freebsd;;
-+ x86_64-*-netbsd*) arch=amd64; system=netbsd;;
- x86_64-*-openbsd*) arch=amd64; system=openbsd;;
- esac
-
-@@ -672,6 +675,7 @@ case "$arch,$model,$system" in
+@@ -680,6 +682,7 @@ case "$arch,$model,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
amd64,*,gnu) profiling='prof';;
@@ -47,15 +39,16 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
*) profiling='noprof';;
esac
-@@ -1060,6 +1064,7 @@ if test "$pthread_wanted" = "yes"; then
- case "$host" in
- *-*-solaris*) pthread_link="-lpthread -lposix4";;
- *-*-freebsd*) pthread_link="-pthread";;
-+ *-*-dragonfly*) pthread_link="-pthread";;
- *-*-openbsd*) pthread_link="-pthread";;
- *) pthread_link="-lpthread";;
- esac
-@@ -1107,6 +1112,7 @@ fi
+@@ -1070,6 +1073,8 @@ if test "$pthread_wanted" = "yes"; then
+ pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
+ *-*-freebsd*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
++ *-*-dragonfly*) pthread_link="-pthread"
++ pthread_caml_link="-cclib -pthread";;
+ *-*-openbsd*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
+ *) pthread_link="-lpthread"
+@@ -1121,6 +1126,7 @@ fi
x11_include="not found"
x11_link="not found"
@@ -63,7 +56,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
for dir in \
$x11_include_dir \
\
-@@ -1153,6 +1159,7 @@ do
+@@ -1167,6 +1173,7 @@ do
break
fi
done
@@ -71,7 +64,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
if test "$x11_include" = "not found"; then
x11_try_lib_dir=''
-@@ -1242,31 +1249,8 @@ dbm_include="not found"
+@@ -1256,31 +1263,8 @@ dbm_include="not found"
dbm_link="not found"
use_gdbm_ndbm=no
@@ -105,13 +98,13 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
echo "NDBM not found, the \"dbm\" library will not be supported."
else
-@@ -1278,8 +1262,8 @@ else
+@@ -1290,8 +1274,8 @@ else
+ else
+ dbm_include="-I$dbm_include"
fi
- echo "DBM_INCLUDES=$dbm_include" >> Makefile
- echo "DBM_LINK=$dbm_link" >> Makefile
- if test "$use_gdbm_ndbm" = "yes"; then
- echo "#define DBM_USES_GDBM_NDBM" >> s.h
-+ if test ${BDB_BUILTIN} != "yes"; then
++ if test ${BDB_BUILTIN} = "yes"; then
+ echo "#define DBM_USES_DB" >> s.h
fi
otherlibraries="$otherlibraries dbm"
diff --git a/lang/ocaml/patches/patch-au b/lang/ocaml/patches/patch-au
index 0c3003caea1..a1b657d5fe6 100644
--- a/lang/ocaml/patches/patch-au
+++ b/lang/ocaml/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-au,v 1.3 2007/09/14 15:34:12 adam Exp $
---- debugger/Makefile.orig 2004-10-15 15:22:45.000000000 +0100
-+++ debugger/Makefile 2004-10-15 15:23:10.000000000 +0100
-@@ -81,7 +81,7 @@
+--- debugger/Makefile.orig 2006-12-09 14:49:10.000000000 +0100
++++ debugger/Makefile
+@@ -83,7 +83,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
install:
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
index bc6ff1eed57..14f7b48eb1f 100644
--- a/lang/ocaml/patches/patch-aw
+++ b/lang/ocaml/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
+$NetBSD: patch-aw,v 1.6 2007/09/14 15:34:12 adam Exp $
---- ocamldoc/Makefile.orig 2006-08-10 14:45:09.000000000 +0200
+--- ocamldoc/Makefile.orig 2007-09-02 08:28:20.000000000 +0200
+++ ocamldoc/Makefile
@@ -258,24 +258,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
# Installation targets
@@ -19,7 +19,7 @@ $NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
+ ${BSD_INSTALL_DATA} ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
+ ${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
-- $(CP) stdlib_man/* $(INSTALL_MANODIR)
+- if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
+ ${BSD_INSTALL_MAN} stdlib_man/* $(INSTALL_MANODIR)
installopt:
diff --git a/lang/ocaml/patches/patch-az b/lang/ocaml/patches/patch-az
index 046888aaa1f..ae0c667e05f 100644
--- a/lang/ocaml/patches/patch-az
+++ b/lang/ocaml/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.1 2004/04/22 09:18:40 tron Exp $
+$NetBSD: patch-az,v 1.2 2007/09/14 15:34:12 adam Exp $
---- otherlibs/dynlink/Makefile.orig Sun Jan 20 16:12:28 2002
-+++ otherlibs/dynlink/Makefile Thu Apr 22 10:34:37 2004
-@@ -38,7 +38,7 @@
+--- otherlibs/dynlink/Makefile.orig 2006-09-19 14:41:33.000000000 +0200
++++ otherlibs/dynlink/Makefile
+@@ -53,7 +53,7 @@ extract_crc: dynlink.cma extract_crc.cmo
$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
install:
diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba
index ede411eea6f..c088eea37c3 100644
--- a/lang/ocaml/patches/patch-ba
+++ b/lang/ocaml/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.4 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-ba,v 1.5 2007/09/14 15:34:12 adam Exp $
---- otherlibs/graph/Makefile.orig 2003-08-05 13:39:33.000000000 +0000
+--- otherlibs/graph/Makefile.orig 2007-01-29 13:11:16.000000000 +0100
+++ otherlibs/graph/Makefile
@@ -18,10 +18,10 @@
include ../../config/Makefile
@@ -10,11 +10,11 @@ $NetBSD: patch-ba,v 1.4 2005/03/24 11:32:50 adam Exp $
-CAMLC=../../ocamlcomp.sh
-CAMLOPT=../../ocamlcompopt.sh
-MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-+CFLAGS+=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+CAMLC=${PREFIX}/bin/ocamlc
+CAMLOPT=${PREFIX}/bin/ocamlopt
+MKLIB=${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlmklib
- COMPFLAGS=-warn-error A
+ COMPFLAGS=-warn-error A -g
OBJS=open.o draw.o fill.o color.o text.o \
@@ -50,13 +50,13 @@ clean: partialclean
diff --git a/lang/ocaml/patches/patch-bn b/lang/ocaml/patches/patch-bn
index 1681eaa777f..1031b61526a 100644
--- a/lang/ocaml/patches/patch-bn
+++ b/lang/ocaml/patches/patch-bn
@@ -1,6 +1,6 @@
-$NetBSD: patch-bn,v 1.3 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-bn,v 1.4 2007/09/14 15:34:12 adam Exp $
---- otherlibs/str/Makefile.orig 2002-12-09 14:05:18.000000000 +0000
+--- otherlibs/str/Makefile.orig 2007-01-29 13:11:16.000000000 +0100
+++ otherlibs/str/Makefile
@@ -19,7 +19,7 @@ include ../../config/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-bn,v 1.3 2005/03/24 11:32:50 adam Exp $
+CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../ocamlcomp.sh
CAMLOPT=../../ocamlcompopt.sh
- COMPFLAGS=-warn-error A
+ COMPFLAGS=-warn-error A -g
@@ -48,13 +48,13 @@ clean: partialclean
rm -f *.a *.so *.o
diff --git a/lang/ocaml/patches/patch-bq b/lang/ocaml/patches/patch-bq
index fe18a01e8d5..6460a157a57 100644
--- a/lang/ocaml/patches/patch-bq
+++ b/lang/ocaml/patches/patch-bq
@@ -1,6 +1,6 @@
-$NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-bq,v 1.3 2007/09/14 15:34:12 adam Exp $
---- otherlibs/unix/Makefile.orig 2004-04-09 13:25:20.000000000 +0000
+--- otherlibs/unix/Makefile.orig 2007-02-07 16:49:11.000000000 +0100
+++ otherlibs/unix/Makefile
@@ -19,7 +19,7 @@ include ../../config/Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
CAMLC=../../ocamlcomp.sh
CAMLOPT=../../ocamlcompopt.sh
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-@@ -66,13 +66,13 @@ clean: partialclean
+@@ -66,14 +66,14 @@ clean: partialclean
rm -f *.a *.o *.so
install:
@@ -21,7 +21,9 @@ $NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
+ ${BSD_INSTALL_DATA} libunix.a $(LIBDIR)/libunix.a
cd $(LIBDIR); $(RANLIB) libunix.a
- cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
+- cp unixsupport.h $(LIBDIR)/caml
+ ${BSD_INSTALL_DATA} unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
++ ${BSD_INSTALL_DATA} unixsupport.h $(LIBDIR)/caml
installopt:
- cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
index 892ab4a812f..9df022fa35c 100644
--- a/lang/ocaml/patches/patch-bs
+++ b/lang/ocaml/patches/patch-bs
@@ -1,6 +1,6 @@
-$NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
---- tools/Makefile.orig 2005-11-17 15:26:37.000000000 +0100
+--- tools/Makefile.orig 2007-02-07 11:31:36.000000000 +0100
+++ tools/Makefile
@@ -49,9 +49,9 @@ clean::
rm -f ocamldep.opt
@@ -36,8 +36,8 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
clean::
rm -f ocamlmktop
-@@ -92,7 +92,7 @@ ocamlmklib: ocamlmklib.cmo
- $(CAMLC) $(LINKFLAGS) -o ocamlmklib ocamlmklib.cmo
+@@ -97,7 +97,7 @@ myocamlbuild_config.ml: ../config/Makefi
+ cp ../myocamlbuild_config.ml .
install::
- cp ocamlmklib $(BINDIR)/ocamlmklib
@@ -45,7 +45,7 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
clean::
rm -f ocamlmklib
-@@ -141,7 +141,7 @@ lexer301.ml: lexer301.mll
+@@ -146,7 +146,7 @@ lexer301.ml: lexer301.mll
$(CAMLLEX) lexer301.mll
install::
@@ -54,7 +54,7 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
clean::
rm -f scrapelabels lexer301.ml
-@@ -157,7 +157,7 @@ addlabels: addlabels.ml
+@@ -162,7 +162,7 @@ addlabels: addlabels.ml
$(ADDLABELS_IMPORTS) addlabels.ml
install::
diff --git a/lang/ocaml/patches/patch-bt b/lang/ocaml/patches/patch-bt
index fe9f5abd94f..dbd1f964080 100644
--- a/lang/ocaml/patches/patch-bt
+++ b/lang/ocaml/patches/patch-bt
@@ -1,8 +1,8 @@
-$NetBSD: patch-bt,v 1.2 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-bt,v 1.3 2007/09/14 15:34:12 adam Exp $
---- Makefile.orig 2005-09-24 18:20:36.000000000 +0200
+--- Makefile.orig 2007-04-16 18:01:59.000000000 +0200
+++ Makefile
-@@ -232,24 +232,24 @@ opt.opt: checkstack core ocaml opt-core
+@@ -234,24 +234,24 @@ opt.opt: checkstack runtime core ocaml o
# Installation
install: FORCE
@@ -40,7 +40,7 @@ $NetBSD: patch-bt,v 1.2 2006/01/16 09:41:48 adam Exp $
cd tools; $(MAKE) install
-cd man; $(MAKE) install
for i in $(OTHERLIBRARIES); do \
-@@ -265,16 +265,16 @@ install: FORCE
+@@ -267,16 +267,16 @@ install: FORCE
# Installation of the native-code compiler
installopt:
cd asmrun; $(MAKE) install
diff --git a/lang/ocaml/patches/patch-bv b/lang/ocaml/patches/patch-bv
deleted file mode 100644
index 839dc22a8b0..00000000000
--- a/lang/ocaml/patches/patch-bv
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bv,v 1.3 2006/10/03 21:06:25 adam Exp $
-
---- camlp4/compile/Makefile.orig 2006-09-12 10:58:10.000000000 +0200
-+++ camlp4/compile/Makefile
-@@ -30,8 +30,8 @@ $D_fast.ml: compile.cmo $(SRC)
- OTOP=$(OTOP) EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) >> $D_fast.ml
-
- install:
-- if test -f camlp4$D.fast.opt; then cp camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
-- for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then cp $$TARG "$(LIBDIR)/camlp4/."; fi; done
-+ if test -f camlp4$D.fast.opt; then ${BSD_INSTALL_DATA} camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
-+ for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then ${BSD_INSTALL_DATA} $$TARG "$(LIBDIR)/camlp4/."; fi; done
-
- clean::
- rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt