Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1648336772252410"
MIME-Version: 1.0
Date: Sat, 26 Mar 2022 23:19:32 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/devel/ocaml-dune
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20220326231932.510E7FB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1648336772252410
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Mar 26 23:19:32 UTC 2022

Modified Files:
	pkgsrc/devel/ocaml-dune: distinfo
Added Files:
	pkgsrc/devel/ocaml-dune/patches:
	    patch-src_dune__filesystem__stubs_readdir.c

Log Message:
ocaml-dune: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ocaml-dune/patches/patch-src_dune__filesystem__stubs_readdir.c

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


--_----------=_1648336772252410
Content-Disposition: inline
Content-Length: 1974
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/ocaml-dune/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.9 pkgsrc/devel/ocaml-dune/distinfo:1.10
--- pkgsrc/devel/ocaml-dune/distinfo:1.9	Tue Mar  1 09:33:09 2022
+++ pkgsrc/devel/ocaml-dune/distinfo	Sat Mar 26 23:19:32 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2022/03/01 09:33:09 jaapb Exp $
+$NetBSD: distinfo,v 1.10 2022/03/26 23:19:32 tnn Exp $
 
 BLAKE2s (dune-2.9.3.tar.gz) = ac5f47b68db9e3055f112bcff7966b781bf7eaedd904fcc5ea28aa98f400a5de
 SHA512 (dune-2.9.3.tar.gz) = df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
 Size (dune-2.9.3.tar.gz) = 1387667 bytes
+SHA1 (patch-src_dune__filesystem__stubs_readdir.c) = 6cd667bfccc81ebcaddd8a36d55728c7e63233fd

Added files:

Index: pkgsrc/devel/ocaml-dune/patches/patch-src_dune__filesystem__stubs_readdir.c
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-src_dune__filesystem__stubs_readdir.c:1.1
--- /dev/null	Sat Mar 26 23:19:32 2022
+++ pkgsrc/devel/ocaml-dune/patches/patch-src_dune__filesystem__stubs_readdir.c	Sat Mar 26 23:19:32 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_dune__filesystem__stubs_readdir.c,v 1.1 2022/03/26 23:19:32 tnn Exp $
+
+no DT_REG on SunOS
+
+--- src/dune_filesystem_stubs/readdir.c.orig	2022-01-26 15:17:00.000000000 +0000
++++ src/dune_filesystem_stubs/readdir.c
+@@ -18,7 +18,7 @@ typedef struct dirent directory_entry;
+ value val_file_type(int typ) {
+   switch(typ)
+     {
+-#ifndef __HAIKU__     
++#if !defined(__HAIKU__) && !defined(__sun)
+    case DT_REG:
+       return Val_int(0);
+     case DT_DIR:
+@@ -59,7 +59,7 @@ CAMLprim value caml__dune_filesystem_stu
+   v_filename = caml_copy_string(e->d_name);
+   v_tuple = caml_alloc_small(2, 0);
+   Field(v_tuple, 0) = v_filename;
+-#ifndef __HAIKU__
++#if !defined(__HAIKU__) && !defined(__sun)
+   Field(v_tuple, 1) = val_file_type(e->d_type);
+ #else
+   Field(v_tuple, 1) = Val_int(7);


--_----------=_1648336772252410--