[pkgsrc/trunk]: pkgsrc/lang/ocaml fix broken patch from last update - ride th...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7846250c60c
branches:  trunk
changeset: 488619:d7846250c60c
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Feb 05 00:04:20 2005 +0000

description:
fix broken patch from last update - ride the recent update

diffstat:

 lang/ocaml/distinfo         |   4 ++--
 lang/ocaml/patches/patch-ah |  22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (97 lines):

diff -r 4d0372d37e8f -r d7846250c60c lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Sat Feb 05 00:03:50 2005 +0000
+++ b/lang/ocaml/distinfo       Sat Feb 05 00:04:20 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: distinfo,v 1.22 2005/02/05 00:04:20 adrianp Exp $
 
 SHA1 (ocaml-3.08.2.tar.gz) = dc0d1ea4bbf0fb714b693621ec7f0b6cfd4eb354
 Size (ocaml-3.08.2.tar.gz) = 2437387 bytes
 SHA1 (patch-aa) = 29b692a7987fb886f5159b2b95044c7e0f2ef76b
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
-SHA1 (patch-ah) = 6570a52e99e152d7ad97600330a5b4cd6e885da8
+SHA1 (patch-ah) = 0d24e2e9234532381f1abdc8336fee87a05530b8
 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
 SHA1 (patch-aj) = e2b0cec6eede0eaee928fdf222fad46d64f648c1
 SHA1 (patch-ak) = 3d87b50076c00f1ffa14754824e783949c2a57a9
diff -r 4d0372d37e8f -r d7846250c60c lang/ocaml/patches/patch-ah
--- a/lang/ocaml/patches/patch-ah       Sat Feb 05 00:03:50 2005 +0000
+++ b/lang/ocaml/patches/patch-ah       Sat Feb 05 00:04:20 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.7 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-ah,v 1.8 2005/02/05 00:04:20 adrianp Exp $
 
---- asmrun/power-bsd.S.orig    2004-10-14 15:48:54.000000000 +0100
-+++ asmrun/power-bsd.S 2004-10-14 15:55:11.000000000 +0100
+--- asmrun/power-bsd.S.orig    2005-02-04 23:36:22.000000000 +0000
++++ asmrun/power-bsd.S 2005-02-04 23:42:19.000000000 +0000
 @@ -13,6 +13,35 @@
  
- /* $Id: patch-ah,v 1.7 2005/02/04 21:35:51 adrianp Exp $ */
+ /* $Id: patch-ah,v 1.8 2005/02/05 00:04:20 adrianp Exp $ */
  
 +#if defined(PROFILING)
 +#define PROFILE_CAML \
@@ -42,7 +42,7 @@
          .globl  caml_call_gc
          .type   caml_call_gc, @function
  caml_call_gc:
-+      PROFILE_CAML
++        PROFILE_CAML
      /* Set up stack frame */
          stwu    1, -0x1A0(1)
      /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */
@@ -50,7 +50,7 @@
          .globl  caml_c_call
          .type   caml_c_call, @function
  caml_c_call:
-+      PROFILE_CAML
++        PROFILE_CAML
      /* Save return address */
          mflr    25
      /* Get ready to call C function (address in 11) */
@@ -58,7 +58,7 @@
          .globl  caml_raise_exception
          .type   caml_raise_exception, @function
  caml_raise_exception:
-+      PROFILE_CAML
++        PROFILE_C
      /* Reload Caml global registers */
          Loadglobal(1, caml_exception_pointer, 11)
          Loadglobal(31, caml_young_ptr, 11)
@@ -66,7 +66,7 @@
          .globl  caml_start_program
          .type   caml_start_program, @function
  caml_start_program:
-+      PROFILE_CAML
++        PROFILE_C
          Addrglobal(12, caml_program)
  
  /* Code shared between caml_start_program and caml_callback */
@@ -74,7 +74,7 @@
          .globl  caml_callback_exn
          .type   caml_callback_exn, @function
  caml_callback_exn:
-+      PROFILE_CAML
++        PROFILE_C
      /* Initial shuffling of arguments */
          mr      0, 3            /* Closure */
          mr      3, 4            /* Argument */
@@ -82,7 +82,7 @@
          .globl  caml_callback2_exn
          .type   caml_callback2_exn, @function
  caml_callback2_exn:
-+      PROFILE_CAML
++        PROFILE_C
          mr      0, 3            /* Closure */
          mr      3, 4            /* First argument */
          mr      4, 5            /* Second argument */
@@ -90,7 +90,7 @@
          .globl  caml_callback3_exn
          .type   caml_callback3_exn, @function
  caml_callback3_exn:
-+      PROFILE_CAML
++        PROFILE_C
          mr      0, 3            /* Closure */
          mr      3, 4            /* First argument */
          mr      4, 5            /* Second argument */