CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Nov 27 19:49:45 UTC 2018

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

Log Message:
Updated package textproc/ocaml-csv to version 2.2.

Minor improvements, mostly, and a switch of the build system to dune.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ocaml-csv/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ocaml-csv/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ocaml-csv/options.mk

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.20 pkgsrc/textproc/ocaml-csv/Makefile:1.21
--- pkgsrc/textproc/ocaml-csv/Makefile:1.20     Mon Nov 12 16:10:27 2018
+++ pkgsrc/textproc/ocaml-csv/Makefile  Tue Nov 27 19:49:45 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2018/11/12 16:10:27 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2018/11/27 19:49:45 jaapb Exp $
 
-VERSION=       2.0
+VERSION=       2.2
 GITHUB_PROJECT=        ocaml-csv
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   5
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
 
@@ -15,8 +14,8 @@ LICENSE=      gnu-lgpl-v2.1
 #HAS_CONFIGURE=        yes
 USE_LANGUAGES= c
 
-OCAML_USE_JBUILDER=    yes
-JBUILDER_BUILD_PACKAGES=       csv
+OCAML_USE_DUNE=        yes
+DUNE_BUILD_PACKAGES=   csv
 OPAM_INSTALL_FILES=    csv
 
 .include "options.mk"

Index: pkgsrc/textproc/ocaml-csv/PLIST
diff -u pkgsrc/textproc/ocaml-csv/PLIST:1.6 pkgsrc/textproc/ocaml-csv/PLIST:1.7
--- pkgsrc/textproc/ocaml-csv/PLIST:1.6 Thu Apr 12 11:10:52 2018
+++ pkgsrc/textproc/ocaml-csv/PLIST     Tue Nov 27 19:49:45 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/04/12 11:10:52 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/11/27 19:49:45 jaapb Exp $
 bin/csvtool
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/META
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv-lwt.dune
@@ -15,7 +15,7 @@ ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmt
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmx
-${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.ml-gen
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.ml
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmt
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmx
@@ -36,7 +36,7 @@ ${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__.ml
 ${OCAML_SITELIB}/csv/csv__Csv_row.cmi
 ${OCAML_SITELIB}/csv/csv__Csv_row.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_row.cmx

Index: pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.8 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.9
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.8 Thu Jul 19 15:15:29 2018
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Tue Nov 27 19:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/07/19 15:15:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/11/27 19:49:45 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-csv
 OCAML_CSV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
-BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0nb4
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.2
 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.5 pkgsrc/textproc/ocaml-csv/distinfo:1.6
--- pkgsrc/textproc/ocaml-csv/distinfo:1.5      Tue Oct 10 09:47:25 2017
+++ pkgsrc/textproc/ocaml-csv/distinfo  Tue Nov 27 19:49:45 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/10/10 09:47:25 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/11/27 19:49:45 jaapb Exp $
 
-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
+SHA1 (ocaml-csv-2.2.tar.gz) = f10de1e5bde9e805258bac114e5023c1e6604663
+RMD160 (ocaml-csv-2.2.tar.gz) = 3053f42030c1cb2775f1dd56302e8927df4bdf74
+SHA512 (ocaml-csv-2.2.tar.gz) = 733f33482d4b26f3046a205808dbbb66e0414ebc0c32fa9529b647828f9ed15cfdee00634d61959ae33ad99a41ac9193c25e6ecf154edf99a8344a5ddde75ccf
+Size (ocaml-csv-2.2.tar.gz) = 45069 bytes

Index: pkgsrc/textproc/ocaml-csv/options.mk
diff -u pkgsrc/textproc/ocaml-csv/options.mk:1.1 pkgsrc/textproc/ocaml-csv/options.mk:1.2
--- pkgsrc/textproc/ocaml-csv/options.mk:1.1    Wed Jan 10 16:46:03 2018
+++ pkgsrc/textproc/ocaml-csv/options.mk        Tue Nov 27 19:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/01/10 16:46:03 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2018/11/27 19:49:45 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-csv
 PKG_SUPPORTED_OPTIONS= lwt
@@ -15,7 +15,7 @@ PLIST_VARS+=  lwt
 .if !empty(PKG_OPTIONS:Mlwt)
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 PLIST.lwt=     yes
-JBUILDER_BUILD_PACKAGES+=      csv-lwt
+DUNE_BUILD_PACKAGES+=  csv-lwt
 OPAM_INSTALL_FILES+=   csv-lwt
 .else
 .endif