CVS commit: pkgsrc/devel/ocaml-ppx_sexp_conv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jul 11 11:40:09 UTC 2017

Modified Files:
        pkgsrc/devel/ocaml-ppx_sexp_conv: Makefile buildlink3.mk distinfo
        pkgsrc/devel/ocaml-ppx_sexp_conv/patches: patch-Makefile

Log Message:
Updated package to version 114.01.04. This is an unreleased version; the
update is necessary because of changes to other packages which means that
the older version does not build.

Changes include:

    Fix generator for polymorphic types where var names clashes with type
                name: type 't t = ...


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk \
    pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile

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_sexp_conv/Makefile
diff -u pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.5 pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.6
--- pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.5       Fri Dec 30 11:16:59 2016
+++ pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile   Tue Jul 11 11:40:09 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2016/12/30 11:16:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2017/07/11 11:40:09 jaapb Exp $
 
-VERSION=       113.33.01
+VERSION=       114.01.04
 GITHUB_PROJECT=        ppx_sexp_conv
-GITHUB_TAG=    ${VERSION}+4.03
+GITHUB_TAG=    ad2cef9
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -14,7 +13,7 @@ HOMEPAGE=     https://github.com/janestreet/
 COMMENT=       Generation of S-expression conversion functions from type definitions
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}-4.03
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-ad2cef90649f86e607d03ab60787bdadc1a2ade4
 HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
 OCAML_USE_FINDLIB=     yes

Index: pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk:1.2 pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk:1.2  Mon Jun 20 19:10:56 2016
+++ pkgsrc/devel/ocaml-ppx_sexp_conv/buildlink3.mk      Tue Jul 11 11:40:09 2017
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/06/20 19:10:56 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 11:40:09 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.33.01
+BUILDLINK_API_DEPENDS.ocaml-ppx_sexp_conv+=    ocaml-ppx_sexp_conv>=114.01.04
 BUILDLINK_PKGSRCDIR.ocaml-ppx_sexp_conv?=      ../../devel/ocaml-ppx_sexp_conv
 
 #.include "../../devel/ocaml-ppx_core/buildlink3.mk"
Index: pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo
diff -u pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo:1.2 pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo:1.3
--- pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo:1.2       Mon Jun 20 19:10:56 2016
+++ pkgsrc/devel/ocaml-ppx_sexp_conv/distinfo   Tue Jul 11 11:40:09 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/06/20 19:10:56 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2017/07/11 11:40:09 jaapb Exp $
 
-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
+SHA1 (ppx_sexp_conv-114.01.04-ad2cef9.tar.gz) = ff9a46f8f1916e73e4fc616d11c21d381d0e3545
+RMD160 (ppx_sexp_conv-114.01.04-ad2cef9.tar.gz) = 4e4b45729bd2cd74b9c5709c403b981c99b27475
+SHA512 (ppx_sexp_conv-114.01.04-ad2cef9.tar.gz) = b9e842cd77ccd61a56b20ce786378c041cecc69363322200a9b73bcfa0a4e7710f6d7ab67fa6e298f2b84573e68227f6c44c9b11e690e47b1613892bf2f0a099
+Size (ppx_sexp_conv-114.01.04-ad2cef9.tar.gz) = 36801 bytes
+SHA1 (patch-Makefile) = 2293f1c7573f6a42be659f2f09eca5960fe8c6ba

Index: pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile:1.1 pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile:1.2
--- pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile:1.1 Mon Jun 20 19:10:57 2016
+++ pkgsrc/devel/ocaml-ppx_sexp_conv/patches/patch-Makefile     Tue Jul 11 11:40:09 2017
@@ -1,19 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2016/06/20 19:10:57 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/07/11 11:40:09 jaapb Exp $
 
-Install into correct location
---- Makefile.orig      2016-04-18 10:09:44.000000000 +0000
+Use OPAM installer properly
+--- Makefile.orig      2016-07-12 16:08:10.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
+@@ -30,7 +30,7 @@ $(NAME).install: install.ml setup.log se
+       ocaml -I "$(OCAML_TOPLEVEL_PATH)" install.ml
  
  install: $(NAME).install
 -      opam-installer -i --prefix $(PREFIX) $(NAME).install