Updated package to latest version, 6.12. Package uses ocaml.mk.

Minor fixes for compatibility with ocaml 4.02.

5 files changed, 78 insertions, 82 deletions

diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
index 2a0c8949821..8d729f256e4 100644
--- a/lang/camlp5/Makefile
+++ b/lang/camlp5/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2014/10/09 21:42:03 jaapb Exp $
 #
 
-DISTNAME=	camlp5-6.11
-PKGREVISION=	1
+DISTNAME=	camlp5-6.12
+PKGNAME=	${DISTNAME} # to avoid being called ocaml-camlp5
 CATEGORIES=	lang
-MASTER_SITES=	http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
+MASTER_SITES=	http://camlp5.gforge.inria.fr/distrib/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tonio@NetBSD.org
-HOMEPAGE=	http://pauillac.inria.fr/~ddr/camlp5/
+HOMEPAGE=	http://camlp5.gforge.inria.fr/
 COMMENT=	Camlp5 is a preprocessor-pretty-printer of ocaml
 LICENSE=	modified-bsd
 
@@ -22,22 +22,19 @@ 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
+INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/camlp5
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/ocaml.mk"
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+.if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET=	world.opt
-PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .else
 BUILD_TARGET=	world
 .endif
-PLIST_SRC+=	${PKGDIR}/PLIST
 
 post-install:
 	cd ${WRKSRC}/etc && \
-	${INSTALL_DATA} META ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/camlp5
+	${INSTALL_DATA} META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlp5
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/camlp5/PLIST b/lang/camlp5/PLIST
index 66462606675..ee929bf258f 100644
--- a/lang/camlp5/PLIST
+++ b/lang/camlp5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/10/08 15:31:14 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/10/09 21:42:03 jaapb Exp $
 bin/camlp5
 bin/camlp5o
 bin/camlp5r
@@ -147,3 +147,65 @@ man/man1/camlp5sch.1
 man/man1/mkcamlp5.1
 man/man1/mkcamlp5.opt.1
 man/man1/ocpp5.1
+${PLIST.ocaml-opt}bin/camlp5o.opt
+${PLIST.ocaml-opt}bin/camlp5r.opt
+${PLIST.ocaml-opt}bin/mkcamlp5.opt
+${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.a
+${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.cmxa
+${PLIST.ocaml-opt}lib/ocaml/camlp5/diff.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/eprinter.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/extfold.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/extfun.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/fstream.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramext.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.a
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.cmxa
+${PLIST.ocaml-opt}lib/ocaml/camlp5/grammar.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmxa
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfold.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfun.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extprint.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_fstream.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lefteval.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lisp.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mkast.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mktest.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_reloc.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o_fast.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_oop.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_op.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pprintf.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pragma.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_r.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_rp.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_scheme.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_sml.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/plexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/plexing.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/ploc.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pprintf.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_depend.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_dump.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extend.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extfun.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extprint.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_null.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_o.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_op.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_r.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_ro.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_rp.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_scheme.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_schemep.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pretty.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_MLast.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_phony.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/stdpp.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/token.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/versdep.cmx
diff --git a/lang/camlp5/PLIST.opt b/lang/camlp5/PLIST.opt
deleted file mode 100644
index 8b182f36b8e..00000000000
--- a/lang/camlp5/PLIST.opt
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.3 2012/10/08 15:31:14 jaapb Exp $
-bin/camlp5o.opt
-bin/camlp5r.opt
-bin/mkcamlp5.opt
-lib/ocaml/camlp5/camlp5.a
-lib/ocaml/camlp5/camlp5.cmxa
-lib/ocaml/camlp5/diff.cmx
-lib/ocaml/camlp5/eprinter.cmx
-lib/ocaml/camlp5/extfold.cmx
-lib/ocaml/camlp5/extfun.cmx
-lib/ocaml/camlp5/fstream.cmx
-lib/ocaml/camlp5/gramext.cmx
-lib/ocaml/camlp5/gramlib.a
-lib/ocaml/camlp5/gramlib.cmxa
-lib/ocaml/camlp5/grammar.cmx
-lib/ocaml/camlp5/odyl.cmx
-lib/ocaml/camlp5/odyl.cmxa
-lib/ocaml/camlp5/pa_extend.cmx
-lib/ocaml/camlp5/pa_extfold.cmx
-lib/ocaml/camlp5/pa_extfun.cmx
-lib/ocaml/camlp5/pa_extprint.cmx
-lib/ocaml/camlp5/pa_fstream.cmx
-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
-lib/ocaml/camlp5/pa_op.cmx
-lib/ocaml/camlp5/pa_pprintf.cmx
-lib/ocaml/camlp5/pa_pragma.cmx
-lib/ocaml/camlp5/pa_r.cmx
-lib/ocaml/camlp5/pa_rp.cmx
-lib/ocaml/camlp5/pa_scheme.cmx
-lib/ocaml/camlp5/pa_sml.cmx
-lib/ocaml/camlp5/plexer.cmx
-lib/ocaml/camlp5/plexing.cmx
-lib/ocaml/camlp5/ploc.cmx
-lib/ocaml/camlp5/pprintf.cmx
-lib/ocaml/camlp5/pr_depend.cmx
-lib/ocaml/camlp5/pr_dump.cmx
-lib/ocaml/camlp5/pr_extend.cmx
-lib/ocaml/camlp5/pr_extfun.cmx
-lib/ocaml/camlp5/pr_extprint.cmx
-lib/ocaml/camlp5/pr_null.cmx
-lib/ocaml/camlp5/pr_o.cmx
-lib/ocaml/camlp5/pr_op.cmx
-lib/ocaml/camlp5/pr_r.cmx
-lib/ocaml/camlp5/pr_ro.cmx
-lib/ocaml/camlp5/pr_rp.cmx
-lib/ocaml/camlp5/pr_scheme.cmx
-lib/ocaml/camlp5/pr_schemep.cmx
-lib/ocaml/camlp5/pretty.cmx
-lib/ocaml/camlp5/q_MLast.cmx
-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 3cf0f81f614..c26e4675ec8 100644
--- a/lang/camlp5/buildlink3.mk
+++ b/lang/camlp5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/10/09 21:42:03 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>=6.11nb1
+BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=6.12
 BUILDLINK_PKGSRCDIR.camlp5?=	../../lang/camlp5
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/lang/camlp5/distinfo b/lang/camlp5/distinfo
index 7dbc8642a7d..5842bacfa73 100644
--- a/lang/camlp5/distinfo
+++ b/lang/camlp5/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2013/08/22 15:25:01 jaapb Exp $
+$NetBSD: distinfo,v 1.10 2014/10/09 21:42:03 jaapb Exp $
 
-SHA1 (camlp5-6.11.tgz) = 4649a2850869d624182bfb5a02f60800ae35b935
-RMD160 (camlp5-6.11.tgz) = 28a4990617da1e65c77f88a34f3d4e527cb14a41
-Size (camlp5-6.11.tgz) = 686711 bytes
+SHA1 (camlp5-6.12.tgz) = d78d89dbd33725d7589181c38cc67180502da2f8
+RMD160 (camlp5-6.12.tgz) = 8f231bc2e7b9ed6e9557a9cfce1b57a76a314d39
+Size (camlp5-6.12.tgz) = 716173 bytes