[pkgsrc/trunk]: pkgsrc/devel/ocaml-ppx_sexp_conv Updated package to latest ve...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61a899627f2e
branches:  trunk
changeset: 348952:61a899627f2e
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Jun 20 19:10:56 2016 +0000

description:
Updated package to latest version, 113.33.01. Changes include:

## 113.33.01+4.03

Remove generation of empty value bindings.

## 113.33.00+4.03

Various updates to work with OCaml 4.03.0

## 113.33.00

- Clean up the documentation for sexplib, modernizing it to include
  `ppx_sexp_conv`, and breaking up the documentation between sexplib and
  `ppx_sexp_conv`.  Also changed the formatting to use org-mode, so it
  will render properly on github.  Markdown doesn't render well by
  default, unless you use quite different conventions about linebeaks.

diffstat:

 devel/ocaml-ppx_sexp_conv/Makefile               |  15 +++++++++------
 devel/ocaml-ppx_sexp_conv/PLIST                  |  23 +++++++++++++----------
 devel/ocaml-ppx_sexp_conv/buildlink3.mk          |   4 ++--
 devel/ocaml-ppx_sexp_conv/distinfo               |  11 ++++++-----
 devel/ocaml-ppx_sexp_conv/patches/patch-Makefile |  23 +++++++++++++++++++++++
 5 files changed, 53 insertions(+), 23 deletions(-)

diffs (130 lines):

diff -r fae22c9277fb -r 61a899627f2e devel/ocaml-ppx_sexp_conv/Makefile
--- a/devel/ocaml-ppx_sexp_conv/Makefile        Mon Jun 20 19:10:51 2016 +0000
+++ b/devel/ocaml-ppx_sexp_conv/Makefile        Mon Jun 20 19:10:56 2016 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/20 19:10:56 jaapb Exp $
 
-VERSION=       113.24.00
+VERSION=       113.33.01
 GITHUB_PROJECT=        ppx_sexp_conv
+GITHUB_TAG=    ${VERSION}+4.03
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -13,12 +13,15 @@
 COMMENT=       Generation of S-expression conversion functions from type definitions
 LICENSE=       apache-2.0
 
+WRKSRC=                ${WRKDIR}/${DISTNAME}-4.03
 HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
+OCAML_USE_FINDLIB=     yes
 
-OCAML_USE_OASIS_DYNRUN=        yes
-
-.include "../../mk/ocaml.mk"
+.include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../devel/ocaml-ppx_core/buildlink3.mk"
 .include "../../devel/ocaml-ppx_type_conv/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../misc/ocaml-opam/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fae22c9277fb -r 61a899627f2e devel/ocaml-ppx_sexp_conv/PLIST
--- a/devel/ocaml-ppx_sexp_conv/PLIST   Mon Jun 20 19:10:51 2016 +0000
+++ b/devel/ocaml-ppx_sexp_conv/PLIST   Mon Jun 20 19:10:56 2016 +0000
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/04 15:50:18 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/20 19:10:56 jaapb Exp $
 ${OCAML_SITELIB}/ppx_sexp_conv/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.a
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.annot
 ${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cma
 ${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmi
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmt
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.cmxs
-${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv.mli
-${OCAML_SITELIB}/ppx_sexp_conv_expander/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.a
-${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.cma
-${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.cmxs
-${OCAML_SITELIB}/ppx_sexp_conv_expander/ppx_sexp_conv_expander.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.a
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.annot
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cma
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmi
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmt
+${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_sexp_conv/ppx_sexp_conv_expander.cmxs
diff -r fae22c9277fb -r 61a899627f2e devel/ocaml-ppx_sexp_conv/buildlink3.mk
--- a/devel/ocaml-ppx_sexp_conv/buildlink3.mk   Mon Jun 20 19:10:51 2016 +0000
+++ b/devel/ocaml-ppx_sexp_conv/buildlink3.mk   Mon Jun 20 19:10:56 2016 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/03/04 15:50:18 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/06/20 19:10:56 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_sexp_conv
 
 .if !defined(OCAML_PPX_SEXP_CONV_BUILDLINK3_MK)
 OCAML_PPX_SEXP_CONV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-ppx_sexp_conv+=    ocaml-ppx_sexp_conv>=113.24.00
+BUILDLINK_API_DEPENDS.ocaml-ppx_sexp_conv+=    ocaml-ppx_sexp_conv>=113.33.01
 BUILDLINK_PKGSRCDIR.ocaml-ppx_sexp_conv?=      ../../devel/ocaml-ppx_sexp_conv
 
 #.include "../../devel/ocaml-ppx_core/buildlink3.mk"
diff -r fae22c9277fb -r 61a899627f2e devel/ocaml-ppx_sexp_conv/distinfo
--- a/devel/ocaml-ppx_sexp_conv/distinfo        Mon Jun 20 19:10:51 2016 +0000
+++ b/devel/ocaml-ppx_sexp_conv/distinfo        Mon Jun 20 19:10:56 2016 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/03/04 15:50:18 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2016/06/20 19:10:56 jaapb Exp $
 
-SHA1 (ppx_sexp_conv-113.24.00.tar.gz) = 52933578450189d61cf5905386bb42ba62970322
-RMD160 (ppx_sexp_conv-113.24.00.tar.gz) = 9f0c92fa715a31cb7af13f43de17d8d6237dc0ef
-SHA512 (ppx_sexp_conv-113.24.00.tar.gz) = c3ee772c5d6e89713d1c4a7fd0858cfcbc9a85e3278727db830ce0b73c0c4c9eb5fc31718644799292ee4e58da345fffa294f1b651287a09c99b7d84400bee82
-Size (ppx_sexp_conv-113.24.00.tar.gz) = 32961 bytes
+SHA1 (ppx_sexp_conv-113.33.01.tar.gz) = f2441255e5c2b25dc4814d70626a1ee373312b9e
+RMD160 (ppx_sexp_conv-113.33.01.tar.gz) = 4c5f55c7573b070cfd9a06273e5f515ef1977140
+SHA512 (ppx_sexp_conv-113.33.01.tar.gz) = 661f8f97560d138c8c690a53ab40d8d26c322bbb5bd60eada9de0bf36c5b28d45c991c961ad309b5ddee7b4638a56b27973a833cb5e46118f0e85267851bd31e
+Size (ppx_sexp_conv-113.33.01.tar.gz) = 36621 bytes
+SHA1 (patch-Makefile) = b12d42bc09b98dcbfc41fbfa01892733d8619c3a
diff -r fae22c9277fb -r 61a899627f2e devel/ocaml-ppx_sexp_conv/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile  Mon Jun 20 19:10:56 2016 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2016/06/20 19:10:57 jaapb Exp $
+
+Install into correct location
+--- Makefile.orig      2016-04-18 10:09:44.000000000 +0000
++++ Makefile
+@@ -2,7 +2,7 @@
+ 
+ SETUP := setup.exe
+ NAME := ppx_sexp_conv
+-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