Updated lang/camlp5 to its latest version. Changes from the old version include:

Camlp5 Version 6.06:
--------------------

* [01 Jun 12] Added compatibility with OCaml 4.00.0 and (incoming) 4.01.0.
* [18 Mar 12] Fixed bug in pr_o: [(let module M = ... in x); y] was
  displayed without parentheses.
* [14 Mar 12] Added compatibility with OCaml 3.12.2.
* [02 Mar 12] Added compatibility with JoCaml 3.12.0 and 3.12.1.
* [02 Mar 12] Completed with all JoCaml statements in ocaml syntax.
  Todo: pretty print.

Camlp5 Version 6.05:
--------------------

* [02 Mar 12] Added compatibility with JoCaml trunk.
* [02 Mar 12] Added option -oname in configure to change ocaml
  command name. The bytecode compiler, native compiler and bytecode
  runtime are respectively <oname>c, <oname>opt and <oname>run.
  The default is 'ocaml', implying that the executables are ocamlc,
  ocamlopt and ocamlrun. Setting it to 'jocaml', fo example, use
  jocamlc, jocamlopt and jocamlrun.

Camlp5 Version 6.04:
--------------------

* [01 Mar 12] Added option -name in configure to change command name
  useful to have transitional and strict versions installed with
  different names. Default: camlp5.
* [01 Mar 12] The default mode at configuration time is now 'strict'.

Camlp5 Version 6.03:
--------------------

* [09 Jan 12] Updated compatibility with OCaml trunk version (3.13.0).

Camlp5 Version 6.02.3:
----------------------

* [20 Oct 11] Updated compatibility with OCaml current version 3.13.0.
* [20 Sep 11] Added missing syntax "_" in ending patt records (rev: "_ = _").
ep 11] Fixed bug pattern -1L was refused in normal syntax.
* [21 May 11] Fixed bug impacting files using q_ast.cmo extension (bad ast).
* [03 May 11] Fixed bug: lexeme errors in revised syntax + utf8.
* [24 Mar 11] Fixed bug: M.(a+b) was refused in normal syntax.
* [16 Mar 11] Fixed bug: incorrect compilation of label patterns of the
  form ~a:b (or ~{a = b} in revised syntax) in class declarations.
* [16 Mar 11] Fixed bug: error while printing label patterns ~a:b with
  pr_o.cmo (error message "labels not pretty printed (in patt)").

Camlp5 Version 6.02.2:
----------------------

* [15 Mar 11] Fixed bug: bad AST generated for class identifier prefixed
  by a module.
* [15 Mar 11] Fixed differences of locations between OCaml and camlp5o (e.g.
  in .annot files)
* [17 Feb 11] Pretty module now considers strings as utf8 encoded (impacts
  computation of strings lengths).
* [04 Feb 11] Revised syntax: completed syntax multi labels, ~{x=y; z=t}
  (equivalent to ~{x=y} ~{z=t}) in patterns (in 6.02.1 was implemented
  only in expressions).
* [28 Jan 11] Added installed module 'Reloc': relocations and equalities
  over syntax trees.
* [26 Jan 11] Fixed bug in camlp5o.opt: did not accept '$' as token.
* [18 Jan 11] Fixed bug: private flags in type manifest were not correctly
  treated.
* [06 Dec 10] Fixed bug in pr_o.cmo: label expressions were not correctly
  pretty printed: f ~a gave f a.

Camlp5 Version 6.02.1:
----------------------

* [05 Dec 10] In module Grammar.Entry.print, added extra parameter ppf
  to print in other formatter than (the default) stdout.
* [21 Nov 10] Revised syntax: added syntax multi labels, ~{x=y; z=t}
  equivalent to ~{x=y} ~{z=t}
* [16 Nov 10] Updated compatibility with OCaml version 3.13.0-gadt.

Camlp5 Version 6.02:
--------------------

* [12 Nov 10] Added compatibility with OCaml GADT version.
* [12 Nov 10] pa_macro: added ability to use ELSIFDEF in match cases (the
  ending ELSE part being still optional).
* [08 Nov 10] Fixed bugs 1/ in pa_o: !Foo.bar was interpreted as (!Foo).bar
  instead of !(Foo.bar) 2/ in top/camlp5_top.cma: the file ast2pt.cmo was
  missing.

Camlp5 Version 6.01:
--------------------

* [03 Nov 10] Added in revised syntax for labels ~{lab x = y} as shortcut
  for ~{lab = fun x -> y}.
* [30 Oct 10] Fixed bug in 'configure': option -libdir did not work.

Camlp5 Version 6.00:
--------------------

* [28 Oct 10] Updated compatibility with OCaml trunk version (3.13.0).
* [01 Oct 10] Make compilation with "make -j" (parallel make) work.
* [29 Sep 10] Fixed bug when using constructors named 'True' and 'False'.
* [24 Sep 10] Fixed many bugs of parsing comments (typically about quotes).
* [23 Sep 10] Fixed bug in pretty printing comments containing '"'.
* [22 Sep 10] Fixed bug bad result of unary minus functions.
* [22 Sep 10] Fixed bug in printing parameters of types of 'with constraint'.
* [22 Sep 10] Fixed bug in revised syntax for class_types. Now application.
  does not need parenthesis any more (like for other entries of that kind).
* [19 Sep 10] In grammars, added list with separator with optional ending
  separator (LIST0 .. SEP OPT_SEP and LIST1 .. SEP OPT_SEP).
* [19 Sep 10] Completed missing statements in particular in objects,
  classes, and first class modules.
* [08 Sep 10] Added option '-flag O' of pr_r.cmo and pr_o.cmo which
  add location comments in the output.
* [08 Sep 10] Added new chapters in the documentation:
     - Directives
     - Redefining OCaml syntax
* [08 Sep 10] Fixed option '-flag E' (equilibrate cases) of pr_r.cmo and
  pr_o.cmo which did not work.
* [06 Sep 10] Changed revised syntax of 'inherit something [params]'
  into 'inherit [params] something' (like in normal syntax).
* [06 Sep 10] Added missing statements:
    - 'module type of' as module type,
    - '(module ... : ...)' as expression,
    - '(val ...)' ('value' in revised syntax) as module expression.
* [02 Sep 10] Added directive "#option" (in files, not in toplevel).
* [02 Sep 10] pa_macro.cmo: phrases inside IFDEF statements now are
  implementation or interface items, which means:
    - ability to use directives which are, therefore, conditional.
    - in revised syntax must end with semicolon (incompatibility with
      previous versions of Camlp5 where these semicolons are syntax
      errors).
    - in revised syntax, ability to put several phrases without having
      to use "declare .. end".
* [30 Aug 10] pa_macro.cmo: added ability to use ELSIFDEF and ELSIFNDEF
  in expressions, structure items and signature items.
* [27 Aug 10] Fixed bug in pa_macro.cmo A AND B computed B AND B.
* [26 Aug 10] Fixed wrong behaviour: char '"' was printed '\"'.
* [25 Aug 10] Added option -no-opt in configure, not to use .opt versions
  of OCaml compilers.
* [20 Aug 10] Added compatibility for OCaml version 3.11.3.
* [18 Aug 10] Added function "get" in library module "Ploc", and a
  statement "lprintf" similar to "pprintf" added by the syntax
  extension kit "pa_pprintf.cmo".

5 files changed, 31 insertions, 13 deletions

diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
index 62718051955..b985aa7968d 100644
--- a/lang/camlp5/Makefile
+++ b/lang/camlp5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 21:56:17 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/08 15:31:14 jaapb Exp $
 #
 
-DISTNAME=	camlp5-5.15
-PKGREVISION=	2
+DISTNAME=	camlp5-6.06
 CATEGORIES=	lang
 MASTER_SITES=	http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +9,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://pauillac.inria.fr/~ddr/camlp5/
 COMMENT=	Camlp5 is a preprocessor-pretty-printer of ocaml
+LICENSE=	modified-bsd
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c # needed for optimised compiler
@@ -21,6 +21,8 @@ CONFIGURE_ARGS+=	--libdir ${PREFIX}/lib/ocaml
 
 REPLACE_SH=	tools/*.sh meta/*.sh ocaml_src/tools/*.sh compile/*.sh
 
+INSTALLATION_DIRS=	lib/ocaml/site-lib/camlp5
+
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
@@ -32,5 +34,9 @@ BUILD_TARGET=	world
 .endif
 PLIST_SRC+=	${PKGDIR}/PLIST
 
+post-install:
+	cd ${WRKSRC}/etc && \
+	${INSTALL_DATA} META ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/camlp5
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/camlp5/PLIST b/lang/camlp5/PLIST
index 433890619cd..66462606675 100644
--- a/lang/camlp5/PLIST
+++ b/lang/camlp5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:03:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/10/08 15:31:14 jaapb Exp $
 bin/camlp5
 bin/camlp5o
 bin/camlp5r
@@ -6,8 +6,6 @@ bin/camlp5sch
 bin/mkcamlp5
 bin/ocpp5
 bin/mkcamlp5
-lib/ocaml/camlp5/ast2pt.cmi
-lib/ocaml/camlp5/ast2pt.mli
 lib/ocaml/camlp5/camlp5.cma
 lib/ocaml/camlp5/camlp5_top.cma
 lib/ocaml/camlp5/camlp5o.cma
@@ -59,6 +57,15 @@ lib/ocaml/camlp5/pa_lisp.o
 lib/ocaml/camlp5/pa_macro.cmi
 lib/ocaml/camlp5/pa_macro.cmo
 lib/ocaml/camlp5/pa_macro.o
+lib/ocaml/camlp5/pa_mkast.cmo
+lib/ocaml/camlp5/pa_mkast.o
+lib/ocaml/camlp5/pa_mktest.cmo
+lib/ocaml/camlp5/pa_mktest.o
+lib/ocaml/camlp5/pa_reloc.cmo
+lib/ocaml/camlp5/pa_reloc.o
+lib/ocaml/camlp5/reloc.cmi
+lib/ocaml/camlp5/reloc.mli
+lib/ocaml/camlp5/versdep.cmi
 lib/ocaml/camlp5/pa_o.cmo
 lib/ocaml/camlp5/pa_o.o
 lib/ocaml/camlp5/pa_oop.cmo
@@ -130,6 +137,7 @@ lib/ocaml/camlp5/stdpp.cmi
 lib/ocaml/camlp5/stdpp.mli
 lib/ocaml/camlp5/token.cmi
 lib/ocaml/camlp5/token.mli
+lib/ocaml/site-lib/camlp5/META
 man/man1/camlp5.1
 man/man1/camlp5o.1
 man/man1/camlp5o.opt.1
diff --git a/lang/camlp5/PLIST.opt b/lang/camlp5/PLIST.opt
index 60caacd17e4..8b182f36b8e 100644
--- a/lang/camlp5/PLIST.opt
+++ b/lang/camlp5/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.2 2008/04/27 10:44:28 tonio Exp $
+@comment $NetBSD: PLIST.opt,v 1.3 2012/10/08 15:31:14 jaapb Exp $
 bin/camlp5o.opt
 bin/camlp5r.opt
 bin/mkcamlp5.opt
@@ -24,6 +24,9 @@ lib/ocaml/camlp5/pa_lefteval.cmx
 lib/ocaml/camlp5/pa_lexer.cmx
 lib/ocaml/camlp5/pa_lisp.cmx
 lib/ocaml/camlp5/pa_macro.cmx
+lib/ocaml/camlp5/pa_mkast.cmx
+lib/ocaml/camlp5/pa_mktest.cmx
+lib/ocaml/camlp5/pa_reloc.cmx
 lib/ocaml/camlp5/pa_o.cmx
 lib/ocaml/camlp5/pa_o_fast.cmx
 lib/ocaml/camlp5/pa_oop.cmx
@@ -57,3 +60,4 @@ lib/ocaml/camlp5/q_ast.cmx
 lib/ocaml/camlp5/q_phony.cmx
 lib/ocaml/camlp5/stdpp.cmx
 lib/ocaml/camlp5/token.cmx
+lib/ocaml/camlp5/versdep.cmx
diff --git a/lang/camlp5/buildlink3.mk b/lang/camlp5/buildlink3.mk
index 550c1a62ef1..4921188a85f 100644
--- a/lang/camlp5/buildlink3.mk
+++ b/lang/camlp5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/05/07 01:53:39 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2012/10/08 15:31:14 jaapb Exp $
 #
 
 BUILDLINK_TREE+=	camlp5
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	camlp5
 CAMLP5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.camlp5+=	camlp5>=5.01
-BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=5.15nb1
+BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=6.06nb1
 BUILDLINK_PKGSRCDIR.camlp5?=	../../lang/camlp5
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/lang/camlp5/distinfo b/lang/camlp5/distinfo
index 150d1b93d49..eb80f63654f 100644
--- a/lang/camlp5/distinfo
+++ b/lang/camlp5/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2010/10/11 21:27:54 tonio Exp $
+$NetBSD: distinfo,v 1.7 2012/10/08 15:31:14 jaapb Exp $
 
-SHA1 (camlp5-5.15.tgz) = 7ccde66923e2ecb07981a2742dd315e637e37e67
-RMD160 (camlp5-5.15.tgz) = 48f9f409f85e9c1f9a5057e0869fba71c70e969c
-Size (camlp5-5.15.tgz) = 714641 bytes
+SHA1 (camlp5-6.06.tgz) = d3d56748de424afc3f878e650254b9d3e5fae6c2
+RMD160 (camlp5-6.06.tgz) = fefa727e756266d3b0697df494042c327f32294d
+Size (camlp5-6.06.tgz) = 681614 bytes