[60078] trunk/dports/devel/omake

[avsm at macports.org]

Revision: 60078
          http://trac.macports.org/changeset/60078
Author:   avsm at macports.org
Date:     2009-11-01 01:27:48 -0800 (Sun, 01 Nov 2009)
Log Message:
-----------
fix omake build with ocaml-3.11.1, maintainer timeout #18786

Modified Paths:
--------------
    trunk/dports/devel/omake/Portfile

Added Paths:
-----------
    trunk/dports/devel/omake/files/patch-omake.diff
    trunk/dports/devel/omake/files/patch-stdin_stdout.bin.diff

Modified: trunk/dports/devel/omake/Portfile
===================================================================
--- trunk/dports/devel/omake/Portfile	2009-11-01 07:53:56 UTC (rev 60077)
+++ trunk/dports/devel/omake/Portfile	2009-11-01 09:27:48 UTC (rev 60078)
@@ -1,11 +1,13 @@
 # $Id$
 
 PortSystem          1.0
+
 name                omake
 version             0.9.8.5-3
+revision            1
+platforms           darwin
 categories          devel
-platforms           darwin
-maintainers         erickt
+maintainers         erickt openmaintainer
 description         OMake is a build system designed for scalability and portability
 long_description    OMake is a build system designed for scalability and portability. \
                     It uses a syntax similar to make utilities you may have used, but \
@@ -19,7 +21,7 @@
                     sha1 e78c9d8858749f5e234cba303637980e24085cbc \
                     rmd160 2364e29a7cc9bd6aaf837818bbe0a64ef4afce14
 
-patchfiles          stdin_stdout.bin
+patchfiles          patch-stdin_stdout.bin.diff patch-omake.diff
 
 depends_lib         port:ocaml
 

Added: trunk/dports/devel/omake/files/patch-omake.diff
===================================================================
--- trunk/dports/devel/omake/files/patch-omake.diff	                        (rev 0)
+++ trunk/dports/devel/omake/files/patch-omake.diff	2009-11-01 09:27:48 UTC (rev 60078)
@@ -0,0 +1,11 @@
+--- src/exec/omake_exec.ml.orig	Thu Nov 27 14:20:45 2008
++++ src/exec/omake_exec.ml	Thu Nov 27 14:20:50 2008
+@@ -46,8 +46,6 @@ open Omake_exec_notify
+ open Omake_options
+ open Omake_command_type
+ 
+-external sync : unit -> unit = "caml_sync"
+-
+ module Exec =
+ struct
+    (*

Added: trunk/dports/devel/omake/files/patch-stdin_stdout.bin.diff
===================================================================
--- trunk/dports/devel/omake/files/patch-stdin_stdout.bin.diff	                        (rev 0)
+++ trunk/dports/devel/omake/files/patch-stdin_stdout.bin.diff	2009-11-01 09:27:48 UTC (rev 60078)
@@ -0,0 +1,19 @@
+diff -urNad src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
+--- src/build/omake_rule.ml	2007-07-02 14:20:23.000000000 -0400
++++ src/build/omake_rule.ml	2007-09-06 12:52:23.752616976 -0400
+@@ -1040,12 +1040,12 @@
+  * Evaluate the commands NOW.
+  *)
+ and exec_commands venv pos loc commands =
+-   let stdin  = channel_of_var venv pos loc stdin_var in
+    let stdout = channel_of_var venv pos loc stdout_var in
+-   let stdin  = Lm_channel.descr stdin in
++   let stderr = channel_of_var venv pos loc stderr_var in
+    let stdout = Lm_channel.descr stdout in
++   let stderr = Lm_channel.descr stderr in
+       List.iter (fun command ->
+-            let pid = eval_shell_internal stdin stdout command in
++            let pid = eval_shell_internal stdout stderr command in
+             let status, _ = eval_shell_wait venv pos pid in
+             let code =
+                match status with
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091101/7242c9ae/attachment.html>