CVS commit: pkgsrc/devel/ocaml-dune-configurator

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Nov 30 01:05:01 UTC 2024

Modified Files:
        pkgsrc/devel/ocaml-dune-configurator: Makefile
Added Files:
        pkgsrc/devel/ocaml-dune-configurator/patches:
            patch-otherlibs_configurator_src_v1.ml

Log Message:
devel/ocaml-dune-configurator: fix pkg-config search.

Don't try to search $PATH for something that's already an absolute
path. Fixes the build of lablgtk3.

PKGREVISION -> 1


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-dune-configurator/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ocaml-dune-configurator/patches/patch-otherlibs_configurator_src_v1.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-dune-configurator/Makefile
diff -u pkgsrc/devel/ocaml-dune-configurator/Makefile:1.5 pkgsrc/devel/ocaml-dune-configurator/Makefile:1.6
--- pkgsrc/devel/ocaml-dune-configurator/Makefile:1.5   Sun Nov  5 21:28:13 2023
+++ pkgsrc/devel/ocaml-dune-configurator/Makefile       Sat Nov 30 01:05:00 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2023/11/05 21:28:13 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2024/11/30 01:05:00 dholland Exp $
 
 .include "../../devel/ocaml-dune/Makefile.common"
 
 PKGNAME=       ocaml-dune-configurator-${DUNE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    jaapb%NetBSD.org@localhost

Added files:

Index: pkgsrc/devel/ocaml-dune-configurator/patches/patch-otherlibs_configurator_src_v1.ml
diff -u /dev/null pkgsrc/devel/ocaml-dune-configurator/patches/patch-otherlibs_configurator_src_v1.ml:1.1
--- /dev/null   Sat Nov 30 01:05:01 2024
+++ pkgsrc/devel/ocaml-dune-configurator/patches/patch-otherlibs_configurator_src_v1.ml Sat Nov 30 01:05:01 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-otherlibs_configurator_src_v1.ml,v 1.1 2024/11/30 01:05:01 dholland Exp $
+
+Don't try to "which" absolute paths.
+
+--- otherlibs/configurator/src/v1.ml~  2023-10-09 11:08:29.000000000 +0000
++++ otherlibs/configurator/src/v1.ml
+@@ -635,7 +635,10 @@ end
+ 
+ let which t prog =
+   logf t "which: %s" prog;
+-  let x = Find_in_path.which prog in
++  let x =
++     if String.length prog > 0 && String.get prog 0 = '/' then Some prog
++     else Find_in_path.which prog
++  in
+   logf
+     t
+     "-> %s"