CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jan 10 16:46:04 UTC 2018

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

Log Message:
Revbump for package textproc/ocaml-csv.

This revision also introduces the lwt option, to optionally build
ocaml-lwt compatibility.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-csv/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r0 -r1.1 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.16 pkgsrc/textproc/ocaml-csv/Makefile:1.17
--- pkgsrc/textproc/ocaml-csv/Makefile:1.16     Sun Jan  7 21:02:29 2018
+++ pkgsrc/textproc/ocaml-csv/Makefile  Wed Jan 10 16:46:03 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2018/01/07 21:02:29 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/10 16:46:03 jaapb Exp $
 
 VERSION=       2.0
 GITHUB_PROJECT=        ocaml-csv
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
 
@@ -16,7 +16,10 @@ LICENSE=     gnu-lgpl-v2.1
 USE_LANGUAGES= c
 
 OCAML_USE_JBUILDER=    yes
+JBUILDER_BUILD_PACKAGES=       csv
+OPAM_INSTALL_FILES=    csv
 
+.include "options.mk"
 .include "../../mk/ocaml.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ocaml-csv/PLIST
diff -u pkgsrc/textproc/ocaml-csv/PLIST:1.4 pkgsrc/textproc/ocaml-csv/PLIST:1.5
--- pkgsrc/textproc/ocaml-csv/PLIST:1.4 Tue Oct 10 09:47:25 2017
+++ pkgsrc/textproc/ocaml-csv/PLIST     Wed Jan 10 16:46:03 2018
@@ -1,5 +1,24 @@
-@comment $NetBSD: PLIST,v 1.4 2017/10/10 09:47:25 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/10 16:46:03 jaapb Exp $
 bin/csvtool
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/META
+${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.a
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cma
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmi
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmt
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmti
+${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmx
+${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmxa
+${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmxs
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.mli
+${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__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
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_utils.ml
+${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/opam
 ${OCAML_SITELIB}/csv/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a
 ${OCAML_SITELIB}/csv/csv.cma
@@ -23,6 +42,9 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/c
 ${OCAML_SITELIB}/csv/csv_row.ml
 ${OCAML_SITELIB}/csv/csv_utils.ml
 ${OCAML_SITELIB}/csv/opam
+${PLIST.lwt}share/doc/csv-lwt/CHANGES.md
+${PLIST.lwt}share/doc/csv-lwt/LICENSE.md
+${PLIST.lwt}share/doc/csv-lwt/README.md
 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.5 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.6
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.5 Sun Jan  7 13:04:34 2018
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Wed Jan 10 16:46:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:34 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/10 16:46:03 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
@@ -6,8 +6,8 @@ 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.0
-BUILDLINK_PKGSRCDIR.ocaml-csv?=                ../../textproc/ocaml-csv
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0nb2
+BUILDLINK_PKGSRCDIR.ocaml-csv?=        ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK
 

Added files:

Index: pkgsrc/textproc/ocaml-csv/options.mk
diff -u /dev/null pkgsrc/textproc/ocaml-csv/options.mk:1.1
--- /dev/null   Wed Jan 10 16:46:04 2018
+++ pkgsrc/textproc/ocaml-csv/options.mk        Wed Jan 10 16:46:03 2018
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2018/01/10 16:46:03 jaapb Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-csv
+PKG_SUPPORTED_OPTIONS= lwt
+PKG_SUGGESTED_OPTIONS= # empty
+PLIST_VARS+=   lwt
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Camlp4 support
+###
+.if !empty(PKG_OPTIONS:Mlwt)
+.include "../../devel/ocaml-lwt/buildlink3.mk"
+PLIST.lwt=     yes
+JBUILDER_BUILD_PACKAGES+=      csv-lwt
+OPAM_INSTALL_FILES+=   csv-lwt
+.else
+.endif