Wed Jan 10 16:46:04 2018 UTC ()
Revbump for package textproc/ocaml-csv.

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


(jaapb)
diff -r1.16 -r1.17 pkgsrc/textproc/ocaml-csv/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/ocaml-csv/PLIST
diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -r0 -r1.1 pkgsrc/textproc/ocaml-csv/options.mk
cvs diff -r1.16 -r1.17 pkgsrc/textproc/ocaml-csv/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-csv/Makefile 2018/01/07 21:02:29 1.16
+++ pkgsrc/textproc/ocaml-csv/Makefile 2018/01/10 16:46:03 1.17
@@ -1,22 +1,25 @@ @@ -1,22 +1,25 @@
1# $NetBSD: Makefile,v 1.16 2018/01/07 21:02:29 joerg Exp $ 1# $NetBSD: Makefile,v 1.17 2018/01/10 16:46:03 jaapb Exp $
2 2
3VERSION= 2.0 3VERSION= 2.0
4GITHUB_PROJECT= ocaml-csv 4GITHUB_PROJECT= ocaml-csv
5DISTNAME= ${GITHUB_PROJECT}-${VERSION} 5DISTNAME= ${GITHUB_PROJECT}-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= textproc 7CATEGORIES= textproc
8MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/}
9 9
10MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://csv.forge.ocamlcore.org/ 11HOMEPAGE= http://csv.forge.ocamlcore.org/
12COMMENT= CSV library for OCaml 12COMMENT= CSV library for OCaml
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15#HAS_CONFIGURE= yes 15#HAS_CONFIGURE= yes
16USE_LANGUAGES= c 16USE_LANGUAGES= c
17 17
18OCAML_USE_JBUILDER= yes 18OCAML_USE_JBUILDER= yes
 19JBUILDER_BUILD_PACKAGES= csv
 20OPAM_INSTALL_FILES= csv
19 21
 22.include "options.mk"
20.include "../../mk/ocaml.mk" 23.include "../../mk/ocaml.mk"
21.include "../../devel/ocaml-lwt/buildlink3.mk" 24.include "../../devel/ocaml-lwt/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/textproc/ocaml-csv/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-csv/PLIST 2017/10/10 09:47:25 1.4
+++ pkgsrc/textproc/ocaml-csv/PLIST 2018/01/10 16:46:03 1.5
@@ -1,28 +1,50 @@ @@ -1,28 +1,50 @@
1@comment $NetBSD: PLIST,v 1.4 2017/10/10 09:47:25 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.5 2018/01/10 16:46:03 jaapb Exp $
2bin/csvtool 2bin/csvtool
 3${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/META
 4${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.a
 5${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cma
 6${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmi
 7${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmt
 8${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmti
 9${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmx
 10${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmxa
 11${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cmxs
 12${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.mli
 13${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmi
 14${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmt
 15${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.cmx
 16${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__.ml-gen
 17${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmi
 18${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmt
 19${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt__Csv_utils.cmx
 20${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_utils.ml
 21${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/opam
3${OCAML_SITELIB}/csv/META 22${OCAML_SITELIB}/csv/META
4${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a 23${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a
5${OCAML_SITELIB}/csv/csv.cma 24${OCAML_SITELIB}/csv/csv.cma
6${OCAML_SITELIB}/csv/csv.cmi 25${OCAML_SITELIB}/csv/csv.cmi
7${OCAML_SITELIB}/csv/csv.cmt 26${OCAML_SITELIB}/csv/csv.cmt
8${OCAML_SITELIB}/csv/csv.cmti 27${OCAML_SITELIB}/csv/csv.cmti
9${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmx 28${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmx
10${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxa 29${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxa
11${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxs 30${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxs
12${OCAML_SITELIB}/csv/csv.mli 31${OCAML_SITELIB}/csv/csv.mli
13${OCAML_SITELIB}/csv/csv__.cmi 32${OCAML_SITELIB}/csv/csv__.cmi
14${OCAML_SITELIB}/csv/csv__.cmt 33${OCAML_SITELIB}/csv/csv__.cmt
15${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__.cmx 34${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__.cmx
16${OCAML_SITELIB}/csv/csv__.ml-gen 35${OCAML_SITELIB}/csv/csv__.ml-gen
17${OCAML_SITELIB}/csv/csv__Csv_row.cmi 36${OCAML_SITELIB}/csv/csv__Csv_row.cmi
18${OCAML_SITELIB}/csv/csv__Csv_row.cmt 37${OCAML_SITELIB}/csv/csv__Csv_row.cmt
19${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_row.cmx 38${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_row.cmx
20${OCAML_SITELIB}/csv/csv__Csv_utils.cmi 39${OCAML_SITELIB}/csv/csv__Csv_utils.cmi
21${OCAML_SITELIB}/csv/csv__Csv_utils.cmt 40${OCAML_SITELIB}/csv/csv__Csv_utils.cmt
22${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_utils.cmx 41${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv__Csv_utils.cmx
23${OCAML_SITELIB}/csv/csv_row.ml 42${OCAML_SITELIB}/csv/csv_row.ml
24${OCAML_SITELIB}/csv/csv_utils.ml 43${OCAML_SITELIB}/csv/csv_utils.ml
25${OCAML_SITELIB}/csv/opam 44${OCAML_SITELIB}/csv/opam
 45${PLIST.lwt}share/doc/csv-lwt/CHANGES.md
 46${PLIST.lwt}share/doc/csv-lwt/LICENSE.md
 47${PLIST.lwt}share/doc/csv-lwt/README.md
26share/doc/csv/CHANGES.md 48share/doc/csv/CHANGES.md
27share/doc/csv/LICENSE.md 49share/doc/csv/LICENSE.md
28share/doc/csv/README.md 50share/doc/csv/README.md
cvs diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-csv/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-csv/buildlink3.mk 2018/01/07 13:04:34 1.5
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk 2018/01/10 16:46:03 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:34 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2018/01/10 16:46:03 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-csv 3BUILDLINK_TREE+= ocaml-csv
4 4
5.if !defined(OCAML_CSV_BUILDLINK3_MK) 5.if !defined(OCAML_CSV_BUILDLINK3_MK)
6OCAML_CSV_BUILDLINK3_MK:= 6OCAML_CSV_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 8BUILDLINK_API_DEPENDS.ocaml-csv+= ocaml-csv>=2.0
9BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 9BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.0nb2
10BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv 10BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv
11 11
12.endif # OCAML_CSV_BUILDLINK3_MK 12.endif # OCAML_CSV_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -ocaml-csv 14BUILDLINK_TREE+= -ocaml-csv
File Added: pkgsrc/textproc/ocaml-csv/options.mk
# $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