# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1235566704 -3600
# Node ID 29f149b6e2be74894515e4b0c0aac70f4c5b7552
# Parent  6052d0605a74f6fefafc31dff8cdb2a9af481962
Correct Caml logic to include missing (deprecated) error constructs.

diff -r 6052d0605a74 -r 29f149b6e2be haxe/haxe.patch
--- a/haxe/haxe.patch	Wed Feb 25 13:55:52 2009 +0100
+++ b/haxe/haxe.patch	Wed Feb 25 13:58:24 2009 +0100
@@ -15,3 +15,19 @@
 -		prerr_endline msg; exit 1
 \ No newline at end of file
 +		prerr_endline msg; exit 1
+Index: haxe/parser.ml
+--- haxe/parser.ml.orig	2008-11-25 21:20:36.000000000 +0100
++++ haxe/parser.ml	2009-02-25 13:44:52.464412227 +0100
+@@ -299,9 +299,9 @@
+ 		}
+ 
+ and parse_type_path_or_const = parser
+-	| [< '(Const (String s),_); >] -> TPConst (String s)
+-	| [< '(Const (Int i),_); >] -> TPConst (Int i)
+-	| [< '(Const (Float f),_); >] -> TPConst (Float f)
++	| [< '(Const (String s),_); placeholder1 >] -> TPConst (String s)
++	| [< '(Const (Int i),_); placeholder2 >] -> TPConst (Int i)
++	| [< '(Const (Float f),_); placeholder3 >] -> TPConst (Float f)
+ 	| [< t = parse_type_path >] -> TPType t
+ 
+ and parse_type_path_next t = parser
diff -r 6052d0605a74 -r 29f149b6e2be haxe/haxe.spec
--- a/haxe/haxe.spec	Wed Feb 25 13:55:52 2009 +0100
+++ b/haxe/haxe.spec	Wed Feb 25 13:58:24 2009 +0100
@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_release  2.02
-%define       V_snapshot 20081125
+%define       V_snapshot 20090130
 
 #   package information
 Name:         haxe
@@ -36,7 +36,7 @@
 Group:        Language
 License:      GPL/BSD
 Version:      %{V_release}.%{V_snapshot}
-Release:      20081125
+Release:      20090106
 
 #   list of sources
 Source0:      ftp://ftp.openpkg.org/sources/CPY/haxe/haxe-%{V_snapshot}.tar.bz2
@@ -71,6 +71,10 @@
     %{l_shtool} subst \
         -e 's%"/usr/lib/libz.dylib".*"/lib/libz.so.1"%"%{l_prefix}/lib/libz.a"%' \
         haxe/doc/install.ml
+    %{l_shtool} subst \
+        -e "s;\(let c_opts = .*-ccopt\);\1 -I %{l_prefix}/include;" \
+        -e "s;\(let c_opts = .* else \"\);\1 -I %{l_prefix}/include;" \
+        haxe/doc/install.ml
     %{l_prefix}/bin/ocaml haxe/doc/install.ml
 
 %install
diff -r 6052d0605a74 -r 29f149b6e2be mtasc/mtasc.patch
--- a/mtasc/mtasc.patch	Wed Feb 25 13:55:52 2009 +0100
+++ b/mtasc/mtasc.patch	Wed Feb 25 13:58:24 2009 +0100
@@ -15,3 +15,44 @@
 -		prerr_endline msg; exit 1
 \ No newline at end of file
 +		prerr_endline msg; exit 1
+Index: ocaml/mtasc/parser.ml
+--- ocaml/mtasc/parser.ml.orig	2007-02-04 14:56:04.000000000 +0100
++++ ocaml/mtasc/parser.ml	2009-02-25 13:52:56.848237653 +0100
+@@ -166,8 +166,8 @@
+ 	| [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e
+ 	| [< '(Kwd If,p); cond = parse_eval; e = parse_expr_opt; e2 , p2 = parse_else (pos e) >] -> EIf (cond,wrap_var e,e2), punion p p2
+ 	| [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2
+-	| [< '(Kwd Break,p); >] -> EBreak , p
+-	| [< '(Kwd Continue,p); >] -> EContinue , p
++	| [< '(Kwd Break,p); placeholder1 >] -> EBreak , p
++	| [< '(Kwd Continue,p); placeholder2 >] -> EContinue , p
+ 	| [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e)
+ 	| [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v)
+ 	| [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2
+@@ -278,7 +278,7 @@
+ 
+ and parse_expr_opt = parser
+ 	| [< e = parse_expr >] -> e
+-	| [< '(Next,p); >] -> EBlock [] , p
++	| [< '(Next,p); placeholder3 >] -> EBlock [] , p
+ 
+ and parse_for p c = parser
+ 	| [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2
+@@ -324,7 +324,7 @@
+ and parse_block callb sp = parser
+ 	| [< e = callb; el,p = parse_block callb sp >] -> e :: el , p
+ 	| [< '(Next,_); el = parse_block callb sp >] -> el
+-	| [< '(BrClose,p); >] -> [] , p
++	| [< '(BrClose,p); placeholder4 >] -> [] , p
+ 	| [< '(Eof,_) >] -> error Unclosed_parenthesis sp
+ 
+ and parse_expr_list p = parser
+@@ -351,7 +351,7 @@
+ 
+ and parse_import = parser
+ 	| [< '(Const (Ident name),_); p = parse_import2 name >] -> p
+-	| [< '(Binop OpMult,_); >] -> [] , None
++	| [< '(Binop OpMult,_); placeholder5 >] -> [] , None
+ 
+ and parse_import2 name = parser
+ 	| [< '(Dot,_); p , n = parse_import >] -> name :: p , n
diff -r 6052d0605a74 -r 29f149b6e2be mtasc/mtasc.spec
--- a/mtasc/mtasc.spec	Wed Feb 25 13:55:52 2009 +0100
+++ b/mtasc/mtasc.spec	Wed Feb 25 13:58:24 2009 +0100
@@ -36,7 +36,7 @@
 Group:        Flash
 License:      GPL/BSD
 Version:      %{V_release}.%{V_snapshot}
-Release:      20080914
+Release:      20090106
 
 #   list of sources
 Source0:      ftp://ftp.openpkg.org/sources/CPY/mtasc/mtasc-%{V_snapshot}.tar.bz2
@@ -46,8 +46,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, ocaml
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20060823, zlib, ocaml
+PreReq:       OpenPKG, openpkg >= 20060823, zlib
 AutoReq:      no
 AutoReqProv:  no
 
@@ -67,6 +67,10 @@
 %prep
     %setup -q -n mtasc
     %patch -p0
+    %{l_shtool} subst \
+        -e "s;\(let c_opts = .*-ccopt\);\1 -I %{l_prefix}/include;" \
+        -e "s;\(let c_opts = .* else \"\);\1 -I %{l_prefix}/include;" \
+        install.ml
 
 %build
     %{l_prefix}/bin/ocaml install.ml