CVS commit: pkgsrc/devel/ocaml-ppx_driver

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Aug 18 11:11:51 UTC 2016

Modified Files:
        pkgsrc/devel/ocaml-ppx_driver: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/ocaml-ppx_driver/patches: patch-_oasis
Removed Files:
        pkgsrc/devel/ocaml-ppx_driver/patches: patch-Makefile

Log Message:
Updated package to unreleased version 113.45.68, based on a GitHub tag.
This was necessary beacuse the latest released version does not compile
with pkgsrc (and an update is needed to make devel/ocaml-ppx_type_conv
compile)to make devel/ocaml-ppx_type_conv
compile).

Changes include:
* Update for the new context free API


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_driver/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-ppx_driver/PLIST \
    pkgsrc/devel/ocaml-ppx_driver/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ocaml-ppx_driver/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-ppx_driver/patches/patch-_oasis

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-ppx_driver/Makefile
diff -u pkgsrc/devel/ocaml-ppx_driver/Makefile:1.4 pkgsrc/devel/ocaml-ppx_driver/Makefile:1.5
--- pkgsrc/devel/ocaml-ppx_driver/Makefile:1.4  Mon Jun 20 18:52:40 2016
+++ pkgsrc/devel/ocaml-ppx_driver/Makefile      Thu Aug 18 11:11:51 2016
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2016/06/20 18:52:40 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/18 11:11:51 jaapb Exp $
 
-VERSION=       113.33.01
+VERSION=       113.45.68
 GITHUB_PROJECT=        ppx_driver
-GITHUB_TAG=    ${VERSION}+4.03
+GITHUB_TAG=    f77579e
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
+#PKGREVISION=  1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -13,14 +14,15 @@ HOMEPAGE=   https://github.com/janestreet/
 COMMENT=       Feature-full driver for OCaml AST transformers
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}-4.03
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-f77579efe402258608bd8dd7174e71b7333db775
 HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
-OCAML_USE_FINDLIB=     yes
+OCAML_USE_OASIS_DYNRUN=        yes
 
-.include "../../devel/ocaml-oasis/buildlink3.mk"
+post-extract:
+       ${MV} ${WRKSRC}/META.ab ${WRKSRC}/src
+
+.include "../../mk/ocaml.mk"
 .include "../../devel/ocaml-ppx_optcomp/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../misc/ocaml-opam/buildlink3.mk"
-.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-ppx_driver/PLIST
diff -u pkgsrc/devel/ocaml-ppx_driver/PLIST:1.2 pkgsrc/devel/ocaml-ppx_driver/PLIST:1.3
--- pkgsrc/devel/ocaml-ppx_driver/PLIST:1.2     Mon Jun 20 18:52:40 2016
+++ pkgsrc/devel/ocaml-ppx_driver/PLIST Thu Aug 18 11:11:51 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/20 18:52:40 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/08/18 11:11:51 jaapb Exp $
 ${OCAML_SITELIB}/ppx_driver/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.a
 ${OCAML_SITELIB}/ppx_driver/ppx_driver.annot
@@ -9,6 +9,7 @@ ${OCAML_SITELIB}/ppx_driver/ppx_driver.c
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmxs
+${OCAML_SITELIB}/ppx_driver/ppx_driver.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.a
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.annot
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cma
@@ -18,6 +19,7 @@ ${OCAML_SITELIB}/ppx_driver/ppx_driver_o
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmxs
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.a
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.annot
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cma
@@ -26,6 +28,7 @@ ${OCAML_SITELIB}/ppx_driver/ppx_driver_r
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmxs
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.a
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.annot
 ${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cma
@@ -34,3 +37,4 @@ ${OCAML_SITELIB}/ppx_driver/ppx_driver_r
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmxs
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.ml
Index: pkgsrc/devel/ocaml-ppx_driver/distinfo
diff -u pkgsrc/devel/ocaml-ppx_driver/distinfo:1.2 pkgsrc/devel/ocaml-ppx_driver/distinfo:1.3
--- pkgsrc/devel/ocaml-ppx_driver/distinfo:1.2  Mon Jun 20 18:52:40 2016
+++ pkgsrc/devel/ocaml-ppx_driver/distinfo      Thu Aug 18 11:11:51 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/06/20 18:52:40 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2016/08/18 11:11:51 jaapb Exp $
 
-SHA1 (ppx_driver-113.33.01.tar.gz) = 5542d2bae51847a751e1e874b89f512a65d708cc
-RMD160 (ppx_driver-113.33.01.tar.gz) = 846c7a04c6788667e8b76188af58e4ae8885e9bc
-SHA512 (ppx_driver-113.33.01.tar.gz) = 6c7bd5f5e03ac455dd505f7956e8102055c5647d00afeda388eb68b79690f1b776ecf9aaa1accde11855e85f8aac0cc7545c4340c7fe53d25d39f2e499e43203
-Size (ppx_driver-113.33.01.tar.gz) = 16096 bytes
-SHA1 (patch-Makefile) = 0ca746d76725a5250b4eff099a24b26d66fc3e8d
+SHA1 (ppx_driver-113.45.68-f77579e.tar.gz) = c4a2bd3bb29debd0954e65d39dbbf279ddf48083
+RMD160 (ppx_driver-113.45.68-f77579e.tar.gz) = d9ef5064a92c18dbd9d3d85ee05e54d4cb0326c3
+SHA512 (ppx_driver-113.45.68-f77579e.tar.gz) = a8195a5d411784dd8202ccd1c0dc54d445e098aed6ea74ca2d183b004e7bcdf2724df2be67e665ce6e215aae44602b35e0c5402ac3b067c906ad225f2997a9f8
+Size (ppx_driver-113.45.68-f77579e.tar.gz) = 18518 bytes
+SHA1 (patch-_oasis) = af75313cc01f696c0f87bf80f4e58ac91adbc2cf

Added files:

Index: pkgsrc/devel/ocaml-ppx_driver/patches/patch-_oasis
diff -u /dev/null pkgsrc/devel/ocaml-ppx_driver/patches/patch-_oasis:1.1
--- /dev/null   Thu Aug 18 11:11:51 2016
+++ pkgsrc/devel/ocaml-ppx_driver/patches/patch-_oasis  Thu Aug 18 11:11:51 2016
@@ -0,0 +1,33 @@
+$NetBSD: patch-_oasis,v 1.1 2016/08/18 11:11:51 jaapb Exp $
+
+Properly detect and generate META files
+--- _oasis.orig        2016-06-03 08:10:50.000000000 +0000
++++ _oasis
+@@ -17,7 +17,7 @@ BuildTools:            ocamlbuild
+ BetaFeatures:          section_object
+ AlphaFeatures:         ocamlbuild_more_args
+ XOCamlbuildPluginTags: package(js-build-tools.ocamlbuild_goodies)
+-FilesAB:               META.ab
++FilesAB:               src/META.ab
+ Description:
+   Part of the Jane Street's PPX rewriters collection.
+ 
+@@ -34,15 +34,18 @@ Library ppx_driver_ocamlbuild
+   Pack:         false
+   Modules:      Ppx_driver_ocamlbuild
+   BuildDepends: ocamlbuild
++  FindlibContainers: ppx_driver
+ 
+ Library ppx_driver_runner
+   Path:         runner
+   Pack:         false
+   Modules:      Ppx_driver_runner
+   BuildDepends: ppx_driver
++  FindlibContainers: ppx_driver
+ 
+ Library ppx_driver_runner_as_ppx
+   Path:         runner_as_ppx
+   Pack:         false
+   Modules:      Ppx_driver_runner_as_ppx
+   BuildDepends: ppx_driver
++  FindlibContainers: ppx_driver