CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Oct 10 09:47:25 UTC 2017

Modified Files:
        pkgsrc/textproc/ocaml-csv: Makefile PLIST buildlink3.mk distinfo

Log Message:
Updated package textproc/ocaml-csv to latest version (2.0).

Changes: Lwt support has been added (I'll add an option for that later)
and the package now uses jbuilder to build.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ocaml-csv/PLIST \
    pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-csv/distinfo

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

Modified files:

Index: pkgsrc/textproc/ocaml-csv/Makefile
diff -u pkgsrc/textproc/ocaml-csv/Makefile:1.14 pkgsrc/textproc/ocaml-csv/Makefile:1.15
--- pkgsrc/textproc/ocaml-csv/Makefile:1.14     Fri Sep  8 09:51:25 2017
+++ pkgsrc/textproc/ocaml-csv/Makefile  Tue Oct 10 09:47:25 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2017/09/08 09:51:25 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2017/10/10 09:47:25 jaapb Exp $
 
-VERSION=       1.7
+VERSION=       2.0
 GITHUB_PROJECT=        ocaml-csv
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
 
@@ -12,25 +11,10 @@ HOMEPAGE=   http://csv.forge.ocamlcore.org
 COMMENT=       CSV library for OCaml
 LICENSE=       gnu-lgpl-v2.1
 
-HAS_CONFIGURE= yes
+#HAS_CONFIGURE=        yes
 USE_LANGUAGES= c
 
-CONFIGURE_ARGS+=       --destdir "${DESTDIR}" --prefix "${PREFIX}" --bindir "${DESTDIR}${PREFIX}/bin"
-
-OCAML_USE_OASIS=       yes
-INSTALLATION_DIRS+=    bin
+OCAML_USE_JBUILDER=    yes
 
 .include "../../mk/ocaml.mk"
-
-post-wrapper:
-       ${RUN} cd ${WRKSRC} && ${MAKE} setup.ml
-
-post-install:
-.if ${OCAML_USE_OPT_COMPILER} == yes
-       ${INSTALL_PROGRAM} ${WRKSRC}/_build/examples/csvtool.native ${DESTDIR}${PREFIX}/bin/csvtool
-.else
-       ${INSTALL_SCRIPT} ${WRKSRC}/_build/examples/csvtool.byte ${DESTDIR}${PREFIX}/bin/csvtool
-.endif
-
-.include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ocaml-csv/PLIST
diff -u pkgsrc/textproc/ocaml-csv/PLIST:1.3 pkgsrc/textproc/ocaml-csv/PLIST:1.4
--- pkgsrc/textproc/ocaml-csv/PLIST:1.3 Tue Jul 11 12:35:54 2017
+++ pkgsrc/textproc/ocaml-csv/PLIST     Tue Oct 10 09:47:25 2017
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2017/07/11 12:35:54 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/10/10 09:47:25 jaapb Exp $
 bin/csvtool
 ${OCAML_SITELIB}/csv/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a
-${OCAML_SITELIB}/csv/csv.annot
 ${OCAML_SITELIB}/csv/csv.cma
 ${OCAML_SITELIB}/csv/csv.cmi
 ${OCAML_SITELIB}/csv/csv.cmt
@@ -10,6 +9,20 @@ ${OCAML_SITELIB}/csv/csv.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv_row.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv_utils.cmx
 ${OCAML_SITELIB}/csv/csv.mli
+${OCAML_SITELIB}/csv/csv__.cmi
+${OCAML_SITELIB}/csv/csv__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__.cmx
+${OCAML_SITELIB}/csv/csv__.ml-gen
+${OCAML_SITELIB}/csv/csv__Csv_row.cmi
+${OCAML_SITELIB}/csv/csv__Csv_row.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_row.cmx
+${OCAML_SITELIB}/csv/csv__Csv_utils.cmi
+${OCAML_SITELIB}/csv/csv__Csv_utils.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_utils.cmx
+${OCAML_SITELIB}/csv/csv_row.ml
+${OCAML_SITELIB}/csv/csv_utils.ml
+${OCAML_SITELIB}/csv/opam
+share/doc/csv/CHANGES.md
+share/doc/csv/LICENSE.md
+share/doc/csv/README.md
Index: pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.3 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.4
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.3 Tue Jul 11 12:36:21 2017
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Tue Oct 10 09:47:25 2017
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 12:36:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2017/10/10 09:47:25 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
 .if !defined(OCAML_CSV_BUILDLINK3_MK)
 OCAML_CSV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=1.5
-BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=1.7
+BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
 BUILDLINK_PKGSRCDIR.ocaml-csv?=        ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK

Index: pkgsrc/textproc/ocaml-csv/distinfo
diff -u pkgsrc/textproc/ocaml-csv/distinfo:1.4 pkgsrc/textproc/ocaml-csv/distinfo:1.5
--- pkgsrc/textproc/ocaml-csv/distinfo:1.4      Tue Jul 11 12:35:54 2017
+++ pkgsrc/textproc/ocaml-csv/distinfo  Tue Oct 10 09:47:25 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/07/11 12:35:54 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2017/10/10 09:47:25 jaapb Exp $
 
-SHA1 (ocaml-csv-1.7.tar.gz) = dcde33b0c95cf9db59bdbf9453832c5ea6bd09d7
-RMD160 (ocaml-csv-1.7.tar.gz) = ecdd7fe3f32b7b0ca277a663b8453b16bebc24e7
-SHA512 (ocaml-csv-1.7.tar.gz) = cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
-Size (ocaml-csv-1.7.tar.gz) = 45160 bytes
+SHA1 (ocaml-csv-2.0.tar.gz) = 822f20ec6a26dbcee7a86949cd5c70ac3946c4e2
+RMD160 (ocaml-csv-2.0.tar.gz) = cb66f007d7597fd2ce97f9cdabc5fb8a21d71119
+SHA512 (ocaml-csv-2.0.tar.gz) = ee3f9b1f26caf590601b4b44d34e364dd050ef86f90753522cdfe92047ea633f7ccfd16aae8a9b1c76b27a696c2d9125ffef13716f4cc3cc29a295913c9f3ac5
+Size (ocaml-csv-2.0.tar.gz) = 44660 bytes