From owner-svn-ports-all@FreeBSD.ORG Wed May 7 17:52:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E527B9B; Wed, 7 May 2014 17:52:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 415738BD; Wed, 7 May 2014 17:52:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47HqUT5001127; Wed, 7 May 2014 17:52:30 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47HqTd7001124; Wed, 7 May 2014 17:52:29 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405071752.s47HqTd7001124@svn.freebsd.org> From: John Marino Date: Wed, 7 May 2014 17:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353185 - in head/devel/ocaml-lwt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 17:52:30 -0000 Author: marino Date: Wed May 7 17:52:29 2014 New Revision: 353185 URL: http://svnweb.freebsd.org/changeset/ports/353185 QAT: https://qat.redports.org/buildarchive/r353185/ Log: devel/ocaml-lwt: Unbreak after Ocaml 4.01 with fix from pkgsrc The maintainer already fixed this port for Ocaml 4.01 on pkgsrc where he also maintains it. Bring the patches over to restore the build. Added: head/devel/ocaml-lwt/files/ head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml (contents, props changed) head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli (contents, props changed) Modified: head/devel/ocaml-lwt/Makefile Modified: head/devel/ocaml-lwt/Makefile ============================================================================== --- head/devel/ocaml-lwt/Makefile Wed May 7 17:48:43 2014 (r353184) +++ head/devel/ocaml-lwt/Makefile Wed May 7 17:52:29 2014 (r353185) @@ -3,7 +3,7 @@ PORTNAME= lwt PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://ocsigen.org/download/ PKGNAMEPREFIX= ocaml- Added: head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml Wed May 7 17:52:29 2014 (r353185) @@ -0,0 +1,15 @@ +$NetBSD: patch-src_unix_lwt_unix.ml,v 1.1 2013/11/01 10:50:03 jaapb Exp $ + +Patch (from upstream git) to compile with ocaml 4.01 +--- src/unix/lwt_unix.ml.orig 2012-12-27 12:29:57.000000000 +0000 ++++ src/unix/lwt_unix.ml +@@ -596,6 +596,9 @@ type open_flag = + #if ocaml_version >= (3, 13) + | O_SHARE_DELETE + #endif ++#if ocaml_version >= (4, 01) ++ | O_CLOEXEC ++#endif + + #if windows + Added: head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli Wed May 7 17:52:29 2014 (r353185) @@ -0,0 +1,15 @@ +$NetBSD: patch-src_unix_lwt_unix.mli,v 1.1 2013/11/01 10:50:03 jaapb Exp $ + +Patch (from upstream git) to compile with ocaml 4.01 +--- src/unix/lwt_unix.mli.orig 2012-12-27 12:29:57.000000000 +0000 ++++ src/unix/lwt_unix.mli +@@ -315,6 +315,9 @@ type open_flag = + #if ocaml_version >= (3, 13) + | O_SHARE_DELETE + #endif ++#if ocaml_version >= (4, 01) ++ | O_CLOEXEC ++#endif + + val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t + (** Wrapper for [Unix.openfile]. *)