[pkgsrc/trunk]: pkgsrc/textproc/ocaml-csv Fixed build problem in textproc/oca...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ac5bf10a2ec
branches:  trunk
changeset: 379578:7ac5bf10a2ec
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu May 19 08:22:33 2022 +0000

description:
Fixed build problem in textproc/ocaml-csv, revbump.

There was a problem with modules not being built correctly according to
options set; I've now corrected this. Thanks to mef@ for reporting this.

diffstat:

 textproc/ocaml-csv/Makefile      |  8 +++++---
 textproc/ocaml-csv/buildlink3.mk |  4 ++--
 textproc/ocaml-csv/options.mk    |  5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r 0dbf870e850e -r 7ac5bf10a2ec textproc/ocaml-csv/Makefile
--- a/textproc/ocaml-csv/Makefile       Thu May 19 07:49:17 2022 +0000
+++ b/textproc/ocaml-csv/Makefile       Thu May 19 08:22:33 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2022/05/05 12:00:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2022/05/19 08:22:33 jaapb Exp $
 
 VERSION=       2.4
+PKGREVISION=   1
 GITHUB_PROJECT=        ocaml-csv
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    textproc
@@ -15,8 +16,9 @@
 USE_LANGUAGES= c
 
 OCAML_USE_DUNE=                yes
-OPAM_INSTALL_FILES=    csv
-OCAML_FINDLIB_DIRS=    csv
+DUNE_BUILD_PACKAGES=   csv
+OPAM_INSTALL_FILES=    ${DUNE_BUILD_PACKAGES}
+OCAML_FINDLIB_DIRS=    ${DUNE_BUILD_PACKAGES}
 
 .include "options.mk"
 .include "../../mk/ocaml.mk"
diff -r 0dbf870e850e -r 7ac5bf10a2ec textproc/ocaml-csv/buildlink3.mk
--- a/textproc/ocaml-csv/buildlink3.mk  Thu May 19 07:49:17 2022 +0000
+++ b/textproc/ocaml-csv/buildlink3.mk  Thu May 19 08:22:33 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2022/05/05 12:00:47 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2022/05/19 08:22:33 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
@@ -6,7 +6,7 @@
 OCAML_CSV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
-BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.4
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.4nb1
 BUILDLINK_PKGSRCDIR.ocaml-csv?=                ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK
diff -r 0dbf870e850e -r 7ac5bf10a2ec textproc/ocaml-csv/options.mk
--- a/textproc/ocaml-csv/options.mk     Thu May 19 07:49:17 2022 +0000
+++ b/textproc/ocaml-csv/options.mk     Thu May 19 08:22:33 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2022/05/05 12:00:47 jaapb Exp $
+# $NetBSD: options.mk,v 1.5 2022/05/19 08:22:33 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-csv
 PKG_SUPPORTED_OPTIONS= lwt
@@ -10,11 +10,12 @@
 .include "../../mk/bsd.options.mk"
 
 ###
-### Camlp4 support
+### Lwt support
 ###
 .if !empty(PKG_OPTIONS:Mlwt)
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 PLIST.lwt=     yes
+DUNE_BUILD_PACKAGES+=  csv-lwt
 OPAM_INSTALL_FILES+=   csv-lwt
 OCAML_FINDLIB_DIRS+=   csv-lwt
 .else