Updated package to latest version, 113.33.01. Changes include:

4 files changed, 94 insertions, 28 deletions

diff --git a/devel/ocaml-ppx_core/Makefile b/devel/ocaml-ppx_core/Makefile
index a47b7a9c477..0f5efe40cb2 100644
--- a/devel/ocaml-ppx_core/Makefile
+++ b/devel/ocaml-ppx_core/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/20 18:48:10 jaapb Exp $
 
-VERSION=	113.24.00
+VERSION=	113.33.01
 GITHUB_PROJECT=	ppx_core
+GITHUB_TAG=	${VERSION}+4.03
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
-PKGREVISION=	1
 PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
@@ -14,11 +13,16 @@ HOMEPAGE=	https://github.com/janestreet/ppx_core/
 COMMENT=	Standard library for OCaml ppx rewriters
 LICENSE=	apache-2.0
 
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${VERSION}-4.03
+
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 
-OCAML_USE_OASIS_DYNRUN=	yes
+OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../misc/ocaml-opam/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppx_core/PLIST b/devel/ocaml-ppx_core/PLIST
index eb8d6e00ef1..48ee2dffae1 100644
--- a/devel/ocaml-ppx_core/PLIST
+++ b/devel/ocaml-ppx_core/PLIST
@@ -1,24 +1,62 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/04 15:22:01 jaapb Exp $
-bin/gen
-bin/gen_ast_builder
-bin/gen_ast_pattern
+@comment $NetBSD: PLIST,v 1.2 2016/06/20 18:48:10 jaapb Exp $
 ${OCAML_SITELIB}/ppx_core/META
-${OCAML_SITELIB}/ppx_core/ast_builder.mli
-${OCAML_SITELIB}/ppx_core/ast_builder_intf.ml
-${OCAML_SITELIB}/ppx_core/ast_pattern.mli
-${OCAML_SITELIB}/ppx_core/ast_pattern0.ml
-${OCAML_SITELIB}/ppx_core/ast_traverse.mli
-${OCAML_SITELIB}/ppx_core/attribute.mli
-${OCAML_SITELIB}/ppx_core/caller_id.ml
-${OCAML_SITELIB}/ppx_core/common.mli
-${OCAML_SITELIB}/ppx_core/extension.mli
-${OCAML_SITELIB}/ppx_core/file_path.mli
-${OCAML_SITELIB}/ppx_core/name.mli
+${OCAML_SITELIB}/ppx_core/ast_builder.annot
+${OCAML_SITELIB}/ppx_core/ast_builder.cmt
+${OCAML_SITELIB}/ppx_core/ast_builder.cmti
+${OCAML_SITELIB}/ppx_core/ast_builder_generated.annot
+${OCAML_SITELIB}/ppx_core/ast_builder_generated.cmt
+${OCAML_SITELIB}/ppx_core/ast_builder_intf.annot
+${OCAML_SITELIB}/ppx_core/ast_builder_intf.cmt
+${OCAML_SITELIB}/ppx_core/ast_pattern.annot
+${OCAML_SITELIB}/ppx_core/ast_pattern.cmt
+${OCAML_SITELIB}/ppx_core/ast_pattern.cmti
+${OCAML_SITELIB}/ppx_core/ast_pattern0.annot
+${OCAML_SITELIB}/ppx_core/ast_pattern0.cmt
+${OCAML_SITELIB}/ppx_core/ast_pattern_generated.annot
+${OCAML_SITELIB}/ppx_core/ast_pattern_generated.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold_map.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold_map.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse_fold_map.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse_iter.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse_iter.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse_iter.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse_map.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse_map.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse_map.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse_map_with_context.annot
+${OCAML_SITELIB}/ppx_core/ast_traverse_map_with_context.cmt
+${OCAML_SITELIB}/ppx_core/ast_traverse_map_with_context.cmti
+${OCAML_SITELIB}/ppx_core/attribute.annot
+${OCAML_SITELIB}/ppx_core/attribute.cmt
+${OCAML_SITELIB}/ppx_core/attribute.cmti
+${OCAML_SITELIB}/ppx_core/caller_id.annot
+${OCAML_SITELIB}/ppx_core/caller_id.cmt
+${OCAML_SITELIB}/ppx_core/common.annot
+${OCAML_SITELIB}/ppx_core/common.cmt
+${OCAML_SITELIB}/ppx_core/common.cmti
+${OCAML_SITELIB}/ppx_core/extension.annot
+${OCAML_SITELIB}/ppx_core/extension.cmt
+${OCAML_SITELIB}/ppx_core/extension.cmti
+${OCAML_SITELIB}/ppx_core/file_path.annot
+${OCAML_SITELIB}/ppx_core/file_path.cmt
+${OCAML_SITELIB}/ppx_core/file_path.cmti
+${OCAML_SITELIB}/ppx_core/name.annot
+${OCAML_SITELIB}/ppx_core/name.cmt
+${OCAML_SITELIB}/ppx_core/name.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.a
 ${OCAML_SITELIB}/ppx_core/ppx_core.cma
 ${OCAML_SITELIB}/ppx_core/ppx_core.cmi
+${OCAML_SITELIB}/ppx_core/ppx_core.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.cmxs
-${OCAML_SITELIB}/ppx_core/spellcheck.ml
-${OCAML_SITELIB}/ppx_core/std.ml
+${OCAML_SITELIB}/ppx_core/spellcheck.annot
+${OCAML_SITELIB}/ppx_core/spellcheck.cmt
+${OCAML_SITELIB}/ppx_core/std.annot
+${OCAML_SITELIB}/ppx_core/std.cmt
diff --git a/devel/ocaml-ppx_core/distinfo b/devel/ocaml-ppx_core/distinfo
index 454ea990149..3269ba6d9b6 100644
--- a/devel/ocaml-ppx_core/distinfo
+++ b/devel/ocaml-ppx_core/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/03/04 15:22:01 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2016/06/20 18:48:10 jaapb Exp $
 
-SHA1 (ppx_core-113.24.00.tar.gz) = ff986f19aafe8f970b0bf6048262489131be5d8a
-RMD160 (ppx_core-113.24.00.tar.gz) = 500199b7affc7ee66bc7848879e03bb8f683b27b
-SHA512 (ppx_core-113.24.00.tar.gz) = c81bf5fee625ab91c8ad627073f1e03f98a3a230b38e58127a40a0b4fdc12ff02f25bf49d3ed2c352db5a83dc6c3e0b6931eeac3fc1f94c7221e53e920b78ef8
-Size (ppx_core-113.24.00.tar.gz) = 37382 bytes
+SHA1 (ppx_core-113.33.01.tar.gz) = 5154aaabd1a62009fd8e98c246c46ca8411aad08
+RMD160 (ppx_core-113.33.01.tar.gz) = ce85219f8d0017a38573ae2389a4625004ee1b46
+SHA512 (ppx_core-113.33.01.tar.gz) = 7a7aec70e96912021b8d81f4561742c47b18b42dd8207eb59b580b150b0a8cf0ac1f7c2f78f5cd0dc249fda9b1548c9a51072686cfd193be882832c50dd8eab9
+Size (ppx_core-113.33.01.tar.gz) = 38685 bytes
+SHA1 (patch-Makefile) = 9992302efc5d05f8dc1f0fd0fa669feaa61787db
diff --git a/devel/ocaml-ppx_core/patches/patch-Makefile b/devel/ocaml-ppx_core/patches/patch-Makefile
new file mode 100644
index 00000000000..db3a7e5d5d2
--- /dev/null
+++ b/devel/ocaml-ppx_core/patches/patch-Makefile
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2016/06/20 18:48:10 jaapb Exp $
+
+Install in corrrect location
+--- Makefile.orig	2016-04-18 10:14:21.000000000 +0000
++++ Makefile
+@@ -2,7 +2,7 @@
+ 
+ SETUP := setup.exe
+ NAME := ppx_core
+-PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
++#PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
+ 
+ # Default rule
+ default: build
+@@ -30,7 +30,7 @@ $(NAME).install: js-utils/gen_install.ml
+ 	ocaml -I js-utils js-utils/gen_install.ml
+ 
+ install: $(NAME).install
+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
++	opam-installer -i --prefix ${DESTDIR}$(PREFIX) --libdir ${OCAML_SITELIBDIR} $(NAME).install
+ 
+ uninstall: $(NAME).install
+ 	opam-installer -u --prefix $(PREFIX) $(NAME).install