CVS commit: pkgsrc/devel/ocaml-dune

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Thu Nov 28 12:51:37 UTC 2024

Modified Files:
        pkgsrc/devel/ocaml-dune: distinfo
Added Files:
        pkgsrc/devel/ocaml-dune/patches: patch-Makefile

Log Message:
devel/ocaml-dune: Unbreak build with non-default mandir

Build system does not respect "configure --mandir"
Added patch to control mandir during install
https://github.com/ocaml/dune/issues/10229


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-dune/patches/patch-Makefile

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/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.12 pkgsrc/devel/ocaml-dune/distinfo:1.13
--- pkgsrc/devel/ocaml-dune/distinfo:1.12       Mon Dec  4 13:56:34 2023
+++ pkgsrc/devel/ocaml-dune/distinfo    Thu Nov 28 12:51:37 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2023/12/04 13:56:34 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2024/11/28 12:51:37 bacon Exp $
 
 BLAKE2s (dune-3.11.1.tar.gz) = 3e657f115bcd7fca087a8dfff9a3a95802bf955626d4925445f2c54dd6172faa
 SHA512 (dune-3.11.1.tar.gz) = 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
 Size (dune-3.11.1.tar.gz) = 2753844 bytes
+SHA1 (patch-Makefile) = 09d6025b4259fe94fd413dc1285b84191436b7c3
 SHA1 (patch-otherlibs_stdune__filesystem__stubs_readdir.c) = 35b116317b5dcca85fe62467544e71935720bc69
 SHA1 (patch-vendor_notty_src-unix_native_winsize.c) = 73dcee62a1356f859eef092e967f4f48383cd5ce

Added files:

Index: pkgsrc/devel/ocaml-dune/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-Makefile:1.1
--- /dev/null   Thu Nov 28 12:51:37 2024
+++ pkgsrc/devel/ocaml-dune/patches/patch-Makefile      Thu Nov 28 12:51:37 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2024/11/28 12:51:37 bacon Exp $
+
+# Temporary hack: configure --mandir is not respected by the build system
+# https://github.com/ocaml/dune/issues/10229
+
+--- Makefile.orig      2023-10-09 11:08:29.000000000 +0000
++++ Makefile
+@@ -3,7 +3,7 @@
+ PREFIX_ARG := $(if $(PREFIX),--prefix $(PREFIX),)
+ LIBDIR_ARG := $(if $(LIBDIR),--libdir $(LIBDIR),)
+ DESTDIR_ARG := $(if $(DESTDIR),--destdir $(DESTDIR),)
+-INSTALL_ARGS := $(PREFIX_ARG) $(LIBDIR_ARG) $(DESTDIR_ARG)
++INSTALL_ARGS := $(PREFIX_ARG) $(LIBDIR_ARG) $(DESTDIR_ARG) --mandir ${PREFIX}/${PKGMANDIR}
+ BIN := ./_boot/dune.exe
+ 
+ # Dependencies used for testing dune, when developed locally and