CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu May 19 08:22:33 UTC 2022

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 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.25 pkgsrc/textproc/ocaml-csv/Makefile:1.26
--- pkgsrc/textproc/ocaml-csv/Makefile:1.25     Thu May  5 12:00:47 2022
+++ pkgsrc/textproc/ocaml-csv/Makefile  Thu May 19 08:22:33 2022
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 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"

Index: pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.12 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.13
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.12        Thu May  5 12:00:47 2022
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Thu May 19 08:22:33 2022
@@ -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 @@ 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.4
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.4nb1
 BUILDLINK_PKGSRCDIR.ocaml-csv?=                ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK

Index: pkgsrc/textproc/ocaml-csv/options.mk
diff -u pkgsrc/textproc/ocaml-csv/options.mk:1.4 pkgsrc/textproc/ocaml-csv/options.mk:1.5
--- pkgsrc/textproc/ocaml-csv/options.mk:1.4    Thu May  5 12:00:47 2022
+++ pkgsrc/textproc/ocaml-csv/options.mk        Thu May 19 08:22:33 2022
@@ -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 @@ PLIST_VARS+=                lwt
 .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