From da88db029d22b84b031cb178c79f4352e5f7d0b0 Mon Sep 17 00:00:00 2001 From: jaapb Date: Thu, 11 Oct 2012 09:48:14 +0000 Subject: Removed obsolete and/or renamed patches. --- lang/ocaml/patches/patch-aa | 13 --------- lang/ocaml/patches/patch-ab | 19 -------------- lang/ocaml/patches/patch-ac | 35 ------------------------- lang/ocaml/patches/patch-ad | 15 ----------- lang/ocaml/patches/patch-ag | 13 --------- lang/ocaml/patches/patch-ah | 64 --------------------------------------------- lang/ocaml/patches/patch-aj | 22 ---------------- lang/ocaml/patches/patch-an | 15 ----------- 8 files changed, 196 deletions(-) delete mode 100644 lang/ocaml/patches/patch-aa delete mode 100644 lang/ocaml/patches/patch-ab delete mode 100644 lang/ocaml/patches/patch-ac delete mode 100644 lang/ocaml/patches/patch-ad delete mode 100644 lang/ocaml/patches/patch-ag delete mode 100644 lang/ocaml/patches/patch-ah delete mode 100644 lang/ocaml/patches/patch-aj delete mode 100644 lang/ocaml/patches/patch-an (limited to 'lang') diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa deleted file mode 100644 index d3eaf1375a1..00000000000 --- a/lang/ocaml/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.10 2012/03/04 09:06:46 asau Exp $ - ---- asmcomp/i386/emit.mlp.orig 2010-01-20 16:26:46 +0000 -+++ asmcomp/i386/emit.mlp -@@ -861,7 +861,7 @@ let emit_profile () = - ` movl %esp, %ebp\n`; - ` pushl %ecx\n`; - ` pushl %edx\n`; -- ` call .mcount\n`; -+ ` call __mcount\n`; - ` popl %edx\n`; - ` popl %ecx\n`; - ` popl %eax\n` diff --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab deleted file mode 100644 index f48f6aaa72b..00000000000 --- a/lang/ocaml/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2009/09/22 20:19:30 tonio Exp $ - ---- otherlibs/dbm/cldbm.c.orig 2003-07-08 15:50:31.000000000 +0200 -+++ otherlibs/dbm/cldbm.c -@@ -21,10 +21,11 @@ - #include - #include - --#ifdef DBM_USES_GDBM_NDBM --#include --#else -+#ifdef DBM_USES_DB - #include -+#else -+#define DB_DBM_HSEARCH 1 -+#include - #endif - - /* Quite close to sys_open_flags, but we need RDWR */ diff --git a/lang/ocaml/patches/patch-ac b/lang/ocaml/patches/patch-ac deleted file mode 100644 index c474fe7ff99..00000000000 --- a/lang/ocaml/patches/patch-ac +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2007/09/14 15:34:10 adam Exp $ - ---- asmcomp/power/emit.mlp.orig 2007-05-10 18:41:12.000000000 +0200 -+++ asmcomp/power/emit.mlp -@@ -825,6 +825,30 @@ let rec emit_all i = - emit_instr i None; - emit_all i.next - -+(* Emission of the profiling prelude *) -+ -+let emit_profile () = -+ match Config.system with -+ "bsd" -> -+ ` stwu 1, -32(1)\n`; -+ ` mflr 0\n`; -+ ` stw 0, 4(1)\n`; -+ ` stw 2, 8(1)\n`; -+ ` stw 3, 12(1)\n`; -+ ` stw 4, 16(1)\n`; -+ ` stw 5, 20(1)\n`; -+ ` stw 6, 24(1)\n`; -+ ` stw 7, 28(1)\n`; -+ ` bl {emit_symbol "_mcount"}\n`; -+ ` lwz 2, 8(1)\n`; -+ ` lwz 3, 12(1)\n`; -+ ` lwz 4, 16(1)\n`; -+ ` lwz 5, 20(1)\n`; -+ ` lwz 6, 24(1)\n`; -+ ` lwz 7, 28(1)\n`; -+ ` addic 1, 1, 32\n`; -+ | _ -> () (*unsupported yet*) -+ - (* Emission of a function declaration *) - - let fundecl fundecl = diff --git a/lang/ocaml/patches/patch-ad b/lang/ocaml/patches/patch-ad deleted file mode 100644 index 5cf9dd1a0bc..00000000000 --- a/lang/ocaml/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2006/01/16 09:41:48 adam Exp $ - ---- byterun/sys.c.orig 2005-11-09 16:58:03.000000000 +0100 -+++ byterun/sys.c -@@ -51,10 +51,6 @@ - #include "stacks.h" - #include "sys.h" - --#ifndef _WIN32 --extern int errno; --#endif -- - static char * error_message(void) - { - return strerror(errno); diff --git a/lang/ocaml/patches/patch-ag b/lang/ocaml/patches/patch-ag deleted file mode 100644 index 7f12722d940..00000000000 --- a/lang/ocaml/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2005/03/24 11:32:50 adam Exp $ - ---- yacc/Makefile.orig 2005-03-24 11:39:56.000000000 +0000 -+++ yacc/Makefile -@@ -17,7 +17,7 @@ - include ../config/Makefile - - CC=$(BYTECC) --CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS) -+CFLAGS+=-DNDEBUG $(BYTECCCOMPOPTS) - - OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \ - skeleton.o symtab.o verbose.o warshall.o diff --git a/lang/ocaml/patches/patch-ah b/lang/ocaml/patches/patch-ah deleted file mode 100644 index e8af5b1a44d..00000000000 --- a/lang/ocaml/patches/patch-ah +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ah,v 1.11 2005/02/06 15:25:36 adrianp Exp $ - ---- asmrun/power-bsd.S.orig 2005-02-06 15:00:21.000000000 +0000 -+++ asmrun/power-bsd.S -@@ -15,2 +15,31 @@ - -+#if defined(PROFILING) -+#define PROFILE_CAML \ -+ stwu 1, -32(1) \ -+ mflr 0 \ -+ stw 0, 4(1) \ -+ stw 2, 8(1) \ -+ stw 3, 12(1) \ -+ stw 4, 16(1) \ -+ stw 5, 20(1) \ -+ stw 6, 24(1) \ -+ stw 7, 28(1) \ -+ bl _mcount \ -+ lwz 2, 8(1) \ -+ lwz 3, 12(1) \ -+ lwz 4, 16(1) \ -+ lwz 5, 20(1) \ -+ lwz 6, 24(1) \ -+ lwz 7, 28(1) \ -+ addic 1, 1, 32 -+ -+#define PROFILE_C \ -+ mflr 0 \ -+ stw 0, 4(1) \ -+ bl _mcount -+#else -+#define PROFILE_CAML -+#define PROFILE_C -+#endif -+ - #define Addrglobal(reg,glob) \ -@@ -32,2 +61,3 @@ - caml_call_gc: -+ PROFILE_CAML - /* Set up stack frame */ -@@ -184,2 +214,3 @@ caml_call_gc: - caml_c_call: -+ PROFILE_CAML - /* Save return address */ -@@ -212,2 +243,3 @@ caml_c_call: - caml_raise_exception: -+ PROFILE_C - /* Reload Caml global registers */ -@@ -232,2 +264,3 @@ caml_raise_exception: - caml_start_program: -+ PROFILE_C - Addrglobal(12, caml_program) -@@ -382,2 +415,3 @@ caml_start_program: - caml_callback_exn: -+ PROFILE_C - /* Initial shuffling of arguments */ -@@ -392,2 +426,3 @@ caml_callback_exn: - caml_callback2_exn: -+ PROFILE_C - mr 0, 3 /* Closure */ -@@ -402,2 +437,3 @@ caml_callback2_exn: - caml_callback3_exn: -+ PROFILE_C - mr 0, 3 /* Closure */ diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj deleted file mode 100644 index f073b4b7daf..00000000000 --- a/lang/ocaml/patches/patch-aj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aj,v 1.8 2010/08/19 08:06:53 asau Exp $ - ---- byterun/Makefile.orig 2010-07-28 17:19:44.000000000 +0400 -+++ byterun/Makefile 2010-08-12 14:30:11.000000000 +0400 -@@ -15,7 +15,7 @@ - - include Makefile.common - --CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR) -+CFLAGS+=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR) - DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR) - - OBJS=$(COMMONOBJS) unix.o main.o -@@ -48,7 +48,7 @@ - - install:: - if test -f libcamlrun_shared.so; then \ -- cp libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi -+ $(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi - - clean:: - rm -f libcamlrun_shared.so diff --git a/lang/ocaml/patches/patch-an b/lang/ocaml/patches/patch-an deleted file mode 100644 index b7580205616..00000000000 --- a/lang/ocaml/patches/patch-an +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-an,v 1.4 2010/08/19 08:06:53 asau Exp $ - ---- camlp4/man/Makefile.orig 2010-01-22 15:48:24.000000000 +0300 -+++ camlp4/man/Makefile 2010-08-12 14:31:23.000000000 +0400 -@@ -9,8 +9,8 @@ - - install-local: - if test -n '$(MANDIR)'; then \ -- $(MKDIR) $(MANDIR)/man1 ; \ -- cp $(TARGET) $(MANDIR)/man1/. ; \ -+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1 ; \ -+ $(BSD_INSTALL_MAN) $(TARGET) $(MANDIR)/man1/. ; \ - for i in $(ALIASES); do \ - rm -f $(MANDIR)/man1/$$i; \ - echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ -- cgit v1.2.3