OpenPKG Specs / changeset

     1.1 --- a/haxe/haxe.patch	Wed Feb 25 13:55:52 2009 +0100
     1.2 +++ b/haxe/haxe.patch	Wed Feb 25 13:58:24 2009 +0100
     1.3 @@ -15,3 +15,19 @@
     1.4  -		prerr_endline msg; exit 1
     1.5  \ No newline at end of file
     1.6  +		prerr_endline msg; exit 1
     1.7 +Index: haxe/parser.ml
     1.8 +--- haxe/parser.ml.orig	2008-11-25 21:20:36.000000000 +0100
     1.9 ++++ haxe/parser.ml	2009-02-25 13:44:52.464412227 +0100
    1.10 +@@ -299,9 +299,9 @@
    1.11 + 		}
    1.12 + 
    1.13 + and parse_type_path_or_const = parser
    1.14 +-	| [< '(Const (String s),_); >] -> TPConst (String s)
    1.15 +-	| [< '(Const (Int i),_); >] -> TPConst (Int i)
    1.16 +-	| [< '(Const (Float f),_); >] -> TPConst (Float f)
    1.17 ++	| [< '(Const (String s),_); placeholder1 >] -> TPConst (String s)
    1.18 ++	| [< '(Const (Int i),_); placeholder2 >] -> TPConst (Int i)
    1.19 ++	| [< '(Const (Float f),_); placeholder3 >] -> TPConst (Float f)
    1.20 + 	| [< t = parse_type_path >] -> TPType t
    1.21 + 
    1.22 + and parse_type_path_next t = parser

     2.1 --- a/haxe/haxe.spec	Wed Feb 25 13:55:52 2009 +0100
     2.2 +++ b/haxe/haxe.spec	Wed Feb 25 13:58:24 2009 +0100
     2.3 @@ -23,7 +23,7 @@
     2.4  
     2.5  #   package version
     2.6  %define       V_release  2.02
     2.7 -%define       V_snapshot 20081125
     2.8 +%define       V_snapshot 20090130
     2.9  
    2.10  #   package information
    2.11  Name:         haxe
    2.12 @@ -36,7 +36,7 @@
    2.13  Group:        Language
    2.14  License:      GPL/BSD
    2.15  Version:      %{V_release}.%{V_snapshot}
    2.16 -Release:      20081125
    2.17 +Release:      20090106
    2.18  
    2.19  #   list of sources
    2.20  Source0:      ftp://ftp.openpkg.org/sources/CPY/haxe/haxe-%{V_snapshot}.tar.bz2
    2.21 @@ -71,6 +71,10 @@
    2.22      %{l_shtool} subst \
    2.23          -e 's%"/usr/lib/libz.dylib".*"/lib/libz.so.1"%"%{l_prefix}/lib/libz.a"%' \
    2.24          haxe/doc/install.ml
    2.25 +    %{l_shtool} subst \
    2.26 +        -e "s;\(let c_opts = .*-ccopt\);\1 -I %{l_prefix}/include;" \
    2.27 +        -e "s;\(let c_opts = .* else \"\);\1 -I %{l_prefix}/include;" \
    2.28 +        haxe/doc/install.ml
    2.29      %{l_prefix}/bin/ocaml haxe/doc/install.ml
    2.30  
    2.31  %install

     3.1 --- a/mtasc/mtasc.patch	Wed Feb 25 13:55:52 2009 +0100
     3.2 +++ b/mtasc/mtasc.patch	Wed Feb 25 13:58:24 2009 +0100
     3.3 @@ -15,3 +15,44 @@
     3.4  -		prerr_endline msg; exit 1
     3.5  \ No newline at end of file
     3.6  +		prerr_endline msg; exit 1
     3.7 +Index: ocaml/mtasc/parser.ml
     3.8 +--- ocaml/mtasc/parser.ml.orig	2007-02-04 14:56:04.000000000 +0100
     3.9 ++++ ocaml/mtasc/parser.ml	2009-02-25 13:52:56.848237653 +0100
    3.10 +@@ -166,8 +166,8 @@
    3.11 + 	| [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e
    3.12 + 	| [< '(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
    3.13 + 	| [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2
    3.14 +-	| [< '(Kwd Break,p); >] -> EBreak , p
    3.15 +-	| [< '(Kwd Continue,p); >] -> EContinue , p
    3.16 ++	| [< '(Kwd Break,p); placeholder1 >] -> EBreak , p
    3.17 ++	| [< '(Kwd Continue,p); placeholder2 >] -> EContinue , p
    3.18 + 	| [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e)
    3.19 + 	| [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v)
    3.20 + 	| [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2
    3.21 +@@ -278,7 +278,7 @@
    3.22 + 
    3.23 + and parse_expr_opt = parser
    3.24 + 	| [< e = parse_expr >] -> e
    3.25 +-	| [< '(Next,p); >] -> EBlock [] , p
    3.26 ++	| [< '(Next,p); placeholder3 >] -> EBlock [] , p
    3.27 + 
    3.28 + and parse_for p c = parser
    3.29 + 	| [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2
    3.30 +@@ -324,7 +324,7 @@
    3.31 + and parse_block callb sp = parser
    3.32 + 	| [< e = callb; el,p = parse_block callb sp >] -> e :: el , p
    3.33 + 	| [< '(Next,_); el = parse_block callb sp >] -> el
    3.34 +-	| [< '(BrClose,p); >] -> [] , p
    3.35 ++	| [< '(BrClose,p); placeholder4 >] -> [] , p
    3.36 + 	| [< '(Eof,_) >] -> error Unclosed_parenthesis sp
    3.37 + 
    3.38 + and parse_expr_list p = parser
    3.39 +@@ -351,7 +351,7 @@
    3.40 + 
    3.41 + and parse_import = parser
    3.42 + 	| [< '(Const (Ident name),_); p = parse_import2 name >] -> p
    3.43 +-	| [< '(Binop OpMult,_); >] -> [] , None
    3.44 ++	| [< '(Binop OpMult,_); placeholder5 >] -> [] , None
    3.45 + 
    3.46 + and parse_import2 name = parser
    3.47 + 	| [< '(Dot,_); p , n = parse_import >] -> name :: p , n

     4.1 --- a/mtasc/mtasc.spec	Wed Feb 25 13:55:52 2009 +0100
     4.2 +++ b/mtasc/mtasc.spec	Wed Feb 25 13:58:24 2009 +0100
     4.3 @@ -36,7 +36,7 @@
     4.4  Group:        Flash
     4.5  License:      GPL/BSD
     4.6  Version:      %{V_release}.%{V_snapshot}
     4.7 -Release:      20080914
     4.8 +Release:      20090106
     4.9  
    4.10  #   list of sources
    4.11  Source0:      ftp://ftp.openpkg.org/sources/CPY/mtasc/mtasc-%{V_snapshot}.tar.bz2
    4.12 @@ -46,8 +46,8 @@
    4.13  #   build information
    4.14  Prefix:       %{l_prefix}
    4.15  BuildRoot:    %{l_buildroot}
    4.16 -BuildPreReq:  OpenPKG, openpkg >= 20060823, ocaml
    4.17 -PreReq:       OpenPKG, openpkg >= 20060823
    4.18 +BuildPreReq:  OpenPKG, openpkg >= 20060823, zlib, ocaml
    4.19 +PreReq:       OpenPKG, openpkg >= 20060823, zlib
    4.20  AutoReq:      no
    4.21  AutoReqProv:  no
    4.22  
    4.23 @@ -67,6 +67,10 @@
    4.24  %prep
    4.25      %setup -q -n mtasc
    4.26      %patch -p0
    4.27 +    %{l_shtool} subst \
    4.28 +        -e "s;\(let c_opts = .*-ccopt\);\1 -I %{l_prefix}/include;" \
    4.29 +        -e "s;\(let c_opts = .* else \"\);\1 -I %{l_prefix}/include;" \
    4.30 +        install.ml
    4.31  
    4.32  %build
    4.33      %{l_prefix}/bin/ocaml install.ml