CVS commit: pkgsrc/misc/ocaml-opaline

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Feb 24 03:10:30 UTC 2025

Modified Files:
        pkgsrc/misc/ocaml-opaline: Makefile distinfo
Added Files:
        pkgsrc/misc/ocaml-opaline/patches: patch-opaline.ml

Log Message:
misc/ocaml-opaline: some fixes in support of new lang/coq

- support "lib_root" section
- quote filenames being installed so filenames with '*' don't result
  in a face-plant

PKGREVISION -> 2


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/ocaml-opaline/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/ocaml-opaline/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/ocaml-opaline/patches/patch-opaline.ml

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

Modified files:

Index: pkgsrc/misc/ocaml-opaline/Makefile
diff -u pkgsrc/misc/ocaml-opaline/Makefile:1.10 pkgsrc/misc/ocaml-opaline/Makefile:1.11
--- pkgsrc/misc/ocaml-opaline/Makefile:1.10     Tue May 24 18:51:53 2022
+++ pkgsrc/misc/ocaml-opaline/Makefile  Mon Feb 24 03:10:30 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/05/24 18:51:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/24 03:10:30 dholland Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-0.3.3
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jaapb/}
 GITHUB_PROJECT=        opaline

Index: pkgsrc/misc/ocaml-opaline/distinfo
diff -u pkgsrc/misc/ocaml-opaline/distinfo:1.7 pkgsrc/misc/ocaml-opaline/distinfo:1.8
--- pkgsrc/misc/ocaml-opaline/distinfo:1.7      Tue Mar  1 09:36:20 2022
+++ pkgsrc/misc/ocaml-opaline/distinfo  Mon Feb 24 03:10:30 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2022/03/01 09:36:20 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2025/02/24 03:10:30 dholland Exp $
 
 BLAKE2s (opaline-0.3.3.tar.gz) = f34434a3658fa99524d27bbb6ae6cf2d4f34a71242586ade35c20b5439e7eee4
 SHA512 (opaline-0.3.3.tar.gz) = 0c84897d2820bc08dd2e752aa5ab0a34ac34045c5109ea0c69da6a802ac1365aa0f7dcc3b26e6fb2c2a37fed926feac0a56e992908dc61a685900147d3e1098a
 Size (opaline-0.3.3.tar.gz) = 3304 bytes
+SHA1 (patch-opaline.ml) = 58b6b82233d579f4e7f711389d8353092d34f00e

Added files:

Index: pkgsrc/misc/ocaml-opaline/patches/patch-opaline.ml
diff -u /dev/null pkgsrc/misc/ocaml-opaline/patches/patch-opaline.ml:1.1
--- /dev/null   Mon Feb 24 03:10:30 2025
+++ pkgsrc/misc/ocaml-opaline/patches/patch-opaline.ml  Mon Feb 24 03:10:30 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-opaline.ml,v 1.1 2025/02/24 03:10:30 dholland Exp $
+
+- Use Filename.quote when passing filenames to Sys.command, which is
+like system(3). Otherwise shell metacharacters like '*' get
+interpreted and things go downhill. Note that you can't quote the
+install command as in general it includes arguments.
+
+- Add support for the lib_root section.
+
+--- opaline.ml.orig    2020-12-09 09:19:33.000000000 +0000
++++ opaline.ml
+@@ -73,11 +73,11 @@ let install_file ?(exec=false) ?(man=fal
+   in
+   if check_file_exists ~optional src then begin
+       if !verbose then Format.printf "- installing from %s to %s@." src path;
+-  ignore (Sys.command (Printf.sprintf "mkdir -p %s" (Filename.dirname path)));
++  ignore (Sys.command (Printf.sprintf "mkdir -p %s" (Filename.quote (Filename.dirname path))));
+   let ret = if exec then
+-       Sys.command (Printf.sprintf "%s %s %s" !exec_install_cmd src path)
++       Sys.command (Printf.sprintf "%s %s %s" !exec_install_cmd (Filename.quote src) (Filename.quote path))
+   else
+-       Sys.command (Printf.sprintf "%s %s %s" !install_cmd src path) in
++       Sys.command (Printf.sprintf "%s %s %s" !install_cmd (Filename.quote src) (Filename.quote path)) in
+       if ret = 0 then
+               ()
+       else
+@@ -104,6 +104,8 @@ let get_libdir { name ; libdir } =
+ let do_install p ~section ~src ?dst () =
+   if section = "lib" then
+     install_file (get_libdir p) src dst
++  else if section = "lib_root" then
++    install_file p.libdir src dst
+   else if section = "libexec" then
+     install_file ~exec:true (get_libdir p) src dst
+   else if section = "bin" then