Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13477

Modified Files:
        ocaml.info 
Added Files:
        ocaml-309-intel.patch 
Log Message:
Ray Garcia's intel/darwin patch backport

Index: ocaml.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ocaml.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ocaml.info  13 Mar 2006 17:43:15 -0000      1.3
+++ ocaml.info  23 Mar 2006 21:58:06 -0000      1.4
@@ -1,6 +1,6 @@
 Package: ocaml
 Version: 3.09.1
-Revision: 1
+Revision: 2
 Description: Latest implementation of Caml dialect of ML
 BuildDepends: tcltk-dev, x11-dev, libncurses5 (>= 5.4-20041023-1006)
 Depends: tcltk, x11, libncurses5-shlibs (>= 5.4-20041023-1006)
@@ -8,7 +8,6 @@
 SetMAKEFLAGS: -j1
 NoSetMAKEFLAGS: true
 Source: http://caml.inria.fr/distrib/%n-3.09/%n-%v.tar.gz
-#SourceDirectory: %n-%v
 Source2: http://caml.inria.fr/distrib/%n-3.09/%n-3.09-refman.pdf
 Source3: http://caml.inria.fr/distrib/%n-3.09/%n-3.09-refman.html.tar.gz
 Source4: http://caml.inria.fr/distrib/%n-3.09/%n-3.09-refman.info.tar.gz
@@ -18,6 +17,7 @@
 Source4-MD5: 280160b1fc7c8513074c3fda0446de29
 PatchScript: <<
  gzip -d ../infoman/ocaml*.gz
+ if test "%m" = i386; then patch -p1 < %a/%n-309-intel.patch; fi
  cd .. && patch -p1 < %a/%n.patch
 <<
 CompileScript: <<

--- NEW FILE: ocaml-309-intel.patch ---
diff -ur ocaml-3.09.1-orig/.depend ocaml/.depend
--- ocaml-3.09.1-orig/.depend   2005-10-26 08:23:27.000000000 -0500
+++ ocaml/.depend       2006-01-24 07:39:53.000000000 -0600
@@ -747,22 +747,24 @@
     bytecomp/emitcode.cmx bytecomp/dll.cmx typing/ctype.cmx \
     utils/consistbl.cmx utils/config.cmx utils/clflags.cmx \
     toplevel/topdirs.cmi 
-toplevel/toploop.cmo: utils/warnings.cmi typing/types.cmi typing/typemod.cmi \
-    typing/typedtree.cmi typing/typecore.cmi bytecomp/translmod.cmi \
-    bytecomp/symtable.cmi bytecomp/simplif.cmi typing/printtyp.cmi \
-    bytecomp/printlambda.cmi bytecomp/printinstr.cmi parsing/printast.cmi \
-    typing/predef.cmi typing/path.cmi parsing/parsetree.cmi parsing/parse.cmi \
+toplevel/toploop.cmo: utils/warnings.cmi typing/unused_var.cmi \
+    typing/types.cmi typing/typemod.cmi typing/typedtree.cmi \
+    typing/typecore.cmi bytecomp/translmod.cmi bytecomp/symtable.cmi \
+    bytecomp/simplif.cmi typing/printtyp.cmi bytecomp/printlambda.cmi \
+    bytecomp/printinstr.cmi parsing/printast.cmi typing/predef.cmi \
+    typing/path.cmi parsing/parsetree.cmi parsing/parse.cmi \
     typing/outcometree.cmi typing/oprint.cmi utils/misc.cmi bytecomp/meta.cmi \
[...2130 lines suppressed...]
diff -ur ocaml-3.09.1-orig/yacc/main.c ocaml/yacc/main.c
--- ocaml-3.09.1-orig/yacc/main.c       2004-11-26 19:04:19.000000000 -0600
+++ ocaml/yacc/main.c   2006-01-23 11:38:43.000000000 -0600
@@ -12,7 +12,7 @@
 
 /* Based on public-domain code from Berkeley Yacc */
 
-/* $Id: main.c,v 1.19 2004/11/27 01:04:19 doligez Exp $ */
+/* $Id: main.c,v 1.19.4.1 2006/01/23 17:38:43 doligez Exp $ */
 
 #include <signal.h>
 #include <string.h>
@@ -157,6 +157,7 @@
         {
         case '\0':
             input_file = stdin;
+            file_prefix = "stdin";
             if (i + 1 < argc) usage();
             return;
 



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to