CVS commit: pkgsrc/devel/ocaml-ppx_optcomp

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Dec 30 11:25:34 UTC 2016

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

Log Message:
This is an update of ppx_optcomp to a new version. This is based on a
github tag, not a 'proper' release, but unfortunately this was needed for
compatibility reasons with other packages. The changelog has not been
updated upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_optcomp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-ppx_optcomp/PLIST \
    pkgsrc/devel/ocaml-ppx_optcomp/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-ppx_optcomp/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_optcomp/Makefile
diff -u pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.4 pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.5
--- pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.4 Sat Jun 25 14:47:54 2016
+++ pkgsrc/devel/ocaml-ppx_optcomp/Makefile     Fri Dec 30 11:25:33 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/06/25 14:47:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2016/12/30 11:25:33 jaapb Exp $
 
-VERSION=       113.33.00
+VERSION=       114.08+89
 GITHUB_PROJECT=        ppx_optcomp
-GITHUB_TAG=    ${VERSION}+4.03
+GITHUB_TAG=    6f1ce80
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    devel
@@ -13,13 +13,17 @@ HOMEPAGE=   https://github.com/janestreet/
 COMMENT=       Optional compilation for OCaml
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}-4.03
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-6f1ce80b1e9dff9b02a1579209e9655994151e15
 HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
-OCAML_USE_FINDLIB=     yes
+OCAML_USE_OASIS_DYNRUN=        yes
+
+post-extract:
+       ${MV} ${WRKSRC}/META.ab ${WRKSRC}/src
 
 .include "../../mk/ocaml.mk"
 .include "../../devel/ocaml-ppx_core/buildlink3.mk"
+.include "../../devel/ocaml-ppx_deriving/buildlink3.mk"
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-ppx_optcomp/PLIST
diff -u pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.2 pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.3
--- pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.2    Sat Jun 25 14:47:54 2016
+++ pkgsrc/devel/ocaml-ppx_optcomp/PLIST        Fri Dec 30 11:25:33 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:47:54 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/12/30 11:25:33 jaapb Exp $
 bin/ppx-optcomp
 ${OCAML_SITELIB}/ppx_optcomp/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.a
@@ -10,3 +10,4 @@ ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxs
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.mli
Index: pkgsrc/devel/ocaml-ppx_optcomp/distinfo
diff -u pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.2 pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.3
--- pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.2 Sat Jun 25 14:47:54 2016
+++ pkgsrc/devel/ocaml-ppx_optcomp/distinfo     Fri Dec 30 11:25:33 2016
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2016/06/25 14:47:54 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2016/12/30 11:25:33 jaapb Exp $
 
-SHA1 (ppx_optcomp-113.33.00.tar.gz) = 0232ac0352073bc05e401be2c7011fd55c538a08
-RMD160 (ppx_optcomp-113.33.00.tar.gz) = 818664cad171138dd739df8b897939dedcf9a0e6
-SHA512 (ppx_optcomp-113.33.00.tar.gz) = b20042d5a25ef4204fd26ba844c1a696577e3f68ace73f122487a64e8ce4138b71792b2bf094068e29a379179d88d2656931ae94bae9c5fcd8307fbdc97aa5c2
-Size (ppx_optcomp-113.33.00.tar.gz) = 16814 bytes
-SHA1 (patch-Makefile) = f55b9c7fe4d6d0cb68e3a66d934a9c8f0fe863a4
+SHA1 (ppx_optcomp-114.08+89-6f1ce80.tar.gz) = 29ce4c9c79205500b10b4b135b93e04d25df7f97
+RMD160 (ppx_optcomp-114.08+89-6f1ce80.tar.gz) = 51ecd6f20acd5ada0dc7f0879f15fb9ba8aee092
+SHA512 (ppx_optcomp-114.08+89-6f1ce80.tar.gz) = eff277acf93fdfdbea5401e86fe4619436683174ddfedebcf18746b74c431e51cd2471550d248f55ab2e0d60e1f4aba636b1d950611d9ca4136c134c9dce6490
+Size (ppx_optcomp-114.08+89-6f1ce80.tar.gz) = 16081 bytes
+SHA1 (patch-_oasis) = 3c642c3efa3bf30d32d37d40c5e826c9ecc0bb30
+SHA1 (patch-src_META.ab) = 76a214c2c2ead0178df9e68a719a2ad06bb0b7df
+SHA1 (patch-src_ppx_optcomp.ml) = c6b2878cbf19fe9487ec9c9641c7385343cf4bb8

Added files:

Index: pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-_oasis
diff -u /dev/null pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-_oasis:1.1
--- /dev/null   Fri Dec 30 11:25:34 2016
+++ pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-_oasis Fri Dec 30 11:25:34 2016
@@ -0,0 +1,14 @@
+$NetBSD: patch-_oasis,v 1.1 2016/12/30 11:25:34 jaapb Exp $
+
+Properly detect and generate META files
+--- _oasis.orig        2016-09-02 10:02:01.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.
+