omake: added patch for 0.9.8.5_3

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@405 18ef50b8-d735-4ccd-97c1-689132df3dd9

3 files changed, 57 insertions, 1 deletions

diff --git a/dev/util/omake/Manifest b/dev/util/omake/Manifest
new file mode 100644
index 0000000..e4e2ffd
--- /dev/null
+++ b/dev/util/omake/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST omake-0.9.8.5-3.tar.gz 3321245 MD5 d114b3c4201808aacd73ec1a98965c47 RMD160 2364e29a7cc9bd6aaf837818bbe0a64ef4afce14 SHA1 e78c9d8858749f5e234cba303637980e24085cbc SHA256 5b675e09f49ff8249a775798f25ab127515cf2fed39527b202784757a35eddad SHA512 29ae7aa1e52bea7b46007c33cc10916da45b2d0e19bfa22b230be143bd84a114a9c02ace41ba5ea0c3010a5f6b49bba9995f5febde2cc503a2d373b957ea3831
+MKBUILD omake.mkbuild 2570 MD5 95317777963fe7fb6a3df96771f3385a RMD160 4d5f015fe9ecba05ae19a95d5c11cb14261fc1a9 SHA1 bcd020c706b933892c7166a65fc13176dc8df202 SHA256 72ee9e0a625805aec3da6334b750e66f030397cfeb8fbae752d11061fe5e3378 SHA512 333025daa7caa08e3344ceda88e20a987e06b9f7b82d886f69817f69a81b6609eb2f137b353092ae5ff9fe4a2a4f405f9d88521359d3fcf44781126bb4375183
+PATCH omake-0.9.8.5-3.diff 1173 MD5 ead218c8e5992ad71fc8cc6c2ffec70a RMD160 98ac914474b6649db06500fd6b99a6bab1f16968 SHA1 355329095c81e57b24a0ffd30d19727b179ef2d9 SHA256 10d08cf59b343fdf2dcf3cc04d8bd3519d1c39a2f209f920d5d0ee3490955b83 SHA512 111781297956ad3e32e8b8c1093dc11911ca3cec4a995a26fe0e6413606eae60dde26e08d2be7e914b893c89a8642a5c17ccd97d926b2678ce105753d4b326f1
+PATCH omake-0.9.8.5_3.diff 1173 MD5 ead218c8e5992ad71fc8cc6c2ffec70a RMD160 98ac914474b6649db06500fd6b99a6bab1f16968 SHA1 355329095c81e57b24a0ffd30d19727b179ef2d9 SHA256 10d08cf59b343fdf2dcf3cc04d8bd3519d1c39a2f209f920d5d0ee3490955b83 SHA512 111781297956ad3e32e8b8c1093dc11911ca3cec4a995a26fe0e6413606eae60dde26e08d2be7e914b893c89a8642a5c17ccd97d926b2678ce105753d4b326f1
+SLACK-REQUIRED slack-required 75 MD5 9a9b562748aafd1b4e5c618ad59df756 RMD160 294a67f27e1db0357590624832a0aecd9bbd0659 SHA1 83f3ed511ad49f565ad9b7125edb17f180bb7120 SHA256 a47a8cdf16d4d814d135a9c43c405af597cfbd404a8275592f1571c0f471a096 SHA512 efefd1e126923af130cff92b5c934244e2537d73217f5cdff575ebbd522718b9987b980c6e9e7089940694490608d9d146ee6a783987ed87d82ef9368d26dde5
+SLACKBUILD omake.SlackBuild 7926 MD5 47e5599717b49389d18ede962b69c20d RMD160 d47624bcb8232e308d405943f2bcb9e960f249a0 SHA1 c0695313081200ea45b6f5503f44a5cbdda73937 SHA256 1f472f438b07ed70378d4bfe55ff21e4d45825be512b935349e5a644b05e1845 SHA512 71ad6233625e4029f1abf5d586f4b4358198c829eca1828c72f10f1f30ae622aeab003c13dd7453be4452973aeb280469a0f10fe0ac08d117386ace04520efa9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ0ChZAAoJEEHL93ESzgeikV4P/jUpphtgcbXvg/J5a7uHDw9X
+ZhgnBo1D0WSgbCkzYUS5zrlFZkgkTbBDyfQ++jcRgCvpkp2lG35sTfEWMi9MZJpJ
+MD7clwWXchVKSZoWago/P6V6JXBkGXKu3IZK4uVK0QTYQTVi+Td0jSnM+pj9rvm1
+YwRdZ23CbC8fQyLOZhT4DIuwO1GChjB8qhncNlNVBEFmrRl8spguaB3pFaJQ3ksq
+iRxDeojJPSSTK5UrZnemXyaH14NlcwouVE7y0d0rwdeZF4xIrGjHEwoKSKfgERSn
+GsJBukQXVDiA3aHRyhOCOXnR6PSbsmwi7+JZklixrms95yFxPzZs3EEH9rj8n9TW
+mSlxPm8CadmZ+fU7aSAkxjyeCrhhCdkbDk0oWxj8ndt1Y5oQG/ddyv8gnukwheYV
+37XqQljQUCEhdv06+BmrjQPZXVlx64ZMyxfCfhpVbiZ78bdGZtqZaiUTVoMlsuua
+ER/SeRaV49MOA1brax0SZJg169VWmZtYNALfU3TkKtNtARJ0Q3zR4Iy5vq6/pVKN
+VHGkJR5GpqOzVpPDQ66I3j4tlibKGkAEK2akBwAO9rglfkwFm57gsGXm02A3TV2y
+sUuJ6fAnsW9fzoc9Q9HKw9hdN6+DVDbElXcDJswXxpdl+pb5zelIqGaucDpyeK3Y
+BxPf38VjRmuCgkj79bQF
+=hDYr
+-----END PGP SIGNATURE-----
diff --git a/dev/util/omake/omake-0.9.8.5_3.diff b/dev/util/omake/omake-0.9.8.5_3.diff
new file mode 100644
index 0000000..e2499e7
--- /dev/null
+++ b/dev/util/omake/omake-0.9.8.5_3.diff
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_stdin_stdout_fix.dpatch by Mike Furr <mfurr@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: stdin <-> stdout fix (upstream r12115)
+
+@DPATCH@
+diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
+--- omake-0.9.8.5~/src/build/omake_rule.ml	2007-07-02 14:20:23.000000000 -0400
++++ omake-0.9.8.5/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
diff --git a/dev/util/omake/omake.mkbuild b/dev/util/omake/omake.mkbuild
index 5f15752..065eebe 100644
--- a/dev/util/omake/omake.mkbuild
+++ b/dev/util/omake/omake.mkbuild
@@ -41,6 +41,9 @@
 # Dependency list
 [[SLACK REQUIRED]]="ocaml"
 
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="dev/util/omake"
+
 #
 # Default enable sections:
 #      head, set_variables, slkflags, start_structure, untar_source,
@@ -57,8 +60,9 @@
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
+ on: manifest_check
  on: untar_source
-off: patch_source
+ on: patch_source
 off: configure
  on: make_package
  on: install_package