summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2005-02-04 23:25:50 +0000
committeradrianp <adrianp@pkgsrc.org>2005-02-04 23:25:50 +0000
commitb9d22b116c803cd8e1d9f298bede8095d4cf9c0d (patch)
tree1ef0276a50dad507edf79e56be8d0b5610d536aa /lang/ocaml
parent0fec156055583575d3bfb236ab2b362bcaa45107 (diff)
downloadpkgsrc-b9d22b116c803cd8e1d9f298bede8095d4cf9c0d.tar.gz
remove obsolete patches for recent update
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/patches/patch-ab12
-rw-r--r--lang/ocaml/patches/patch-ad22
-rw-r--r--lang/ocaml/patches/patch-ae27
-rw-r--r--lang/ocaml/patches/patch-af42
-rw-r--r--lang/ocaml/patches/patch-ag16
-rw-r--r--lang/ocaml/patches/patch-bj17
-rw-r--r--lang/ocaml/patches/patch-bl17
7 files changed, 0 insertions, 153 deletions
diff --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab
deleted file mode 100644
index 354bdf08d2c..00000000000
--- a/lang/ocaml/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/04/22 09:18:36 tron Exp $
-
---- asmcomp/power/arch.ml.orig Mon Jul 22 18:37:53 2002
-+++ asmcomp/power/arch.ml Thu Apr 22 10:34:38 2004
-@@ -91,6 +91,5 @@
- let toc =
- match Config.system with
- | "aix" -> true
-- | "elf" -> false
-- | "rhapsody" -> false
-+ | "elf" | "rhapsody" | "bsd" -> false
- | _ -> Misc.fatal_error "wrong $(SYSTEM)"
diff --git a/lang/ocaml/patches/patch-ad b/lang/ocaml/patches/patch-ad
deleted file mode 100644
index 39ee1b892d7..00000000000
--- a/lang/ocaml/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2004/04/22 09:18:36 tron Exp $
-
---- asmcomp/power/proc.ml.orig Mon Jul 22 18:37:54 2002
-+++ asmcomp/power/proc.ml Thu Apr 22 10:34:38 2004
-@@ -190,7 +190,7 @@
- let loc_external_arguments =
- match Config.system with
- "aix" | "rhapsody" -> poweropen_external_conventions 0 7 100 112
-- | "elf" -> calling_conventions 0 7 100 107 outgoing 8
-+ | "elf" | "bsd" -> calling_conventions 0 7 100 107 outgoing 8
- | _ -> assert false
-
- let extcall_use_push = false
-@@ -244,7 +244,7 @@
- Ccomp.command ("as -u -m " ^ proc ^ " -o " ^ outfile ^ " " ^ infile)
- | "elf" ->
- Ccomp.command ("as -u -m ppc -o " ^ outfile ^ " " ^ infile)
-- | "rhapsody" ->
-+ | "rhapsody" | "bsd" ->
- Ccomp.command ("as -o " ^ outfile ^ " " ^ infile)
- | _ -> assert false
-
diff --git a/lang/ocaml/patches/patch-ae b/lang/ocaml/patches/patch-ae
deleted file mode 100644
index 814f9be7c16..00000000000
--- a/lang/ocaml/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/04/22 09:18:36 tron Exp $
-
---- asmcomp/sparc/emit.mlp.orig Mon Jul 22 18:37:55 2002
-+++ asmcomp/sparc/emit.mlp Thu Apr 22 10:34:37 2004
-@@ -57,11 +57,10 @@
- | {loc = Reg r; typ = Float} -> phys_reg (r + 16)
- | _ -> fatal_error "Emit.next_in_pair"
-
--(* Symbols are prefixed with _ under SunOS and BSD but not under Solaris
-- nor Linux *)
-+(* Symbols are prefixed with _ under SunOS *)
-
- let symbol_prefix =
-- if Config.system = "solaris" || Config.system = "linux" then "" else "_"
-+ if Config.system = "sunos" then "_" else ""
-
- let emit_symbol s =
- if String.length s >= 1 & s.[0] = '.'
-@@ -79,7 +78,7 @@
- (* Output a label *)
-
- let label_prefix =
-- if Config.system = "solaris" || Config.system = "linux" then ".L" else "L"
-+ if Config.system = "sunos" then "L" else ".L"
-
- let emit_label lbl =
- emit_string label_prefix; emit_int lbl
diff --git a/lang/ocaml/patches/patch-af b/lang/ocaml/patches/patch-af
deleted file mode 100644
index f502c0adf06..00000000000
--- a/lang/ocaml/patches/patch-af
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/04/22 09:18:36 tron Exp $
-
---- asmrun/signals.c.orig Mon May 6 14:02:26 2002
-+++ asmrun/signals.c Thu Apr 22 10:34:37 2004
-@@ -162,6 +162,8 @@
- void handle_signal(int sig, struct sigcontext * context)
- #elif defined(TARGET_power) && defined(SYS_rhapsody)
- void handle_signal(int sig, int code, struct sigcontext * context)
-+#elif defined(TARGET_power) && defined(SYS_bsd)
-+void handle_signal(int sig, int code, struct sigcontext * context)
- #else
- void handle_signal(int sig)
- #endif
-@@ -205,6 +207,10 @@
- /* Cached in register 30 */
- CONTEXT_GPR(context, 30) = (unsigned long) young_limit;
- #endif
-+#if defined(TARGET_power) && defined(SYS_bsd)
-+ /* Cached in register 30 */
-+ context->sc_frame.fixreg[30] = (unsigned long) young_limit;
-+#endif
- }
- }
- }
-@@ -442,6 +448,17 @@
- array_bound_error();
- }
- #endif
-+
-+#if defined(TARGET_power) && defined(SYS_bsd)
-+static void trap_handler(int sig, int code, struct sigcontext * context)
-+{
-+ /* Recover young_ptr and caml_exception_pointer from registers 31 and 29 */
-+ caml_exception_pointer = (char *) context->sc_frame.fixreg[29];
-+ young_ptr = (char *) context->sc_frame.fixreg[31];
-+ array_bound_error();
-+}
-+#endif
-+
-
- /* Machine- and OS-dependent handling of stack overflow */
-
diff --git a/lang/ocaml/patches/patch-ag b/lang/ocaml/patches/patch-ag
deleted file mode 100644
index 658b5ec1bea..00000000000
--- a/lang/ocaml/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/04/22 09:18:36 tron Exp $
-
---- asmrun/sparc.S.orig Fri Feb 8 17:55:33 2002
-+++ asmrun/sparc.S Thu Apr 22 10:34:38 2004
-@@ -16,9 +16,9 @@
- /* Asm part of the runtime system for the Sparc processor. */
- /* Must be preprocessed by cpp */
-
--/* SunOS 4 and BSD prefix identifiers with _, Solaris and Linux do not */
-+/* SunOS 4 prefixes identifiers with _ */
-
--#if defined(SYS_sunos) || defined(SYS_bsd)
-+#if defined(SYS_sunos)
-
- .common _caml_required_size, 4, "bss"
-
diff --git a/lang/ocaml/patches/patch-bj b/lang/ocaml/patches/patch-bj
deleted file mode 100644
index 383908a7e46..00000000000
--- a/lang/ocaml/patches/patch-bj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2004/04/22 09:18:44 tron Exp $
-
---- otherlibs/labltk/support/cltkImg.c.orig Tue Jul 23 16:11:59 2002
-+++ otherlibs/labltk/support/cltkImg.c Thu Apr 22 10:34:38 2004
-@@ -99,7 +99,11 @@
- pib.offset[0] = 0;
- pib.offset[1] = 1;
- pib.offset[2] = 2;
-- Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h));
-+ Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-+ , TK_PHOTO_COMPOSITE_SET
-+#endif
-+ );
- }
-
- CAMLprim void camltk_setimgdata_bytecode(argv,argn)
diff --git a/lang/ocaml/patches/patch-bl b/lang/ocaml/patches/patch-bl
deleted file mode 100644
index 0375a71ab18..00000000000
--- a/lang/ocaml/patches/patch-bl
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bl,v 1.1 2004/04/22 09:18:44 tron Exp $
-
---- otherlibs/labltk/tkanim/tkAnimGIF.c.orig Tue Jul 23 16:12:00 2002
-+++ otherlibs/labltk/tkanim/tkAnimGIF.c Thu Apr 22 10:34:38 2004
-@@ -336,7 +336,11 @@
- }
- }
- Tk_PhotoPutBlock(photoHandle, &block, 0, 0,
-- imageWidth, imageHeight);
-+ imageWidth, imageHeight
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-+ , TK_PHOTO_COMPOSITE_SET
-+#endif
-+ );
- #ifdef TKANIM_DEBUG
- fprintf(stderr, " Retrieving result\n");
- #endif