Ticket #18786: devel--omake.patch

devel/omake/Portfile

@@ -1 +1 @@
 # $Id: Portfile 31207 2007-11-18 10:25:12Z erickt@macports.org $
 
 PortSystem          1.0
+
 name                omake
 version             0.9.8.5-3
+platforms           darwin
 categories          devel
 maintainers         erickt@macports.org
 description         OMake is a build system designed for scalability and portability
@@ -18 +20 @@
                     sha1 e78c9d8858749f5e234cba303637980e24085cbc \
                     rmd160 2364e29a7cc9bd6aaf837818bbe0a64ef4afce14
 
-patchfiles          stdin_stdout.bin
+patchfiles          patch-stdin_stdout.bin.diff patch-omake.diff
 
 depends_lib         port:ocaml
 

devel/omake/files/patch-omake.diff

@@ +1 @@
+--- 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
+    (*

devel/omake/files/patch-stdin_stdout.bin.diff

@@ +1 @@
+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

devel/omake/files/stdin_stdout.bin

@@ -1 @@
-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