Date: Fri, 11 Feb 2000 21:55:20 +0100 (CET) From: kuehn@rz.tu-clausthal.de (Ronald Kuehn) To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16656: ports/lang/ocaml update to 2.04 Message-ID: <200002112055.VAA91249@merlin.rz.tu-clausthal.de>
next in thread | raw e-mail | index | archive | help
>Number: 16656 >Category: ports >Synopsis: ports/lang/ocaml updated to 2.04 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 11 13:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Ronald Kuehn >Release: FreeBSD 3.4-STABLE i386 >Organization: Clausthal University of Technology >Environment: tested on 3.4-STABLE i386 >Description: version updated from 2.02 to 2.04 Note: I did not test the FreeBSD/alpha version >How-To-Repeat: >Fix: diff -ruN ocaml.old/Makefile ocaml.new/Makefile --- ocaml.old/Makefile Fri Feb 11 21:42:11 2000 +++ ocaml.new/Makefile Fri Feb 11 15:42:50 2000 @@ -6,7 +6,7 @@ # $FreeBSD: ports/lang/ocaml/Makefile,v 1.10 1999/08/25 06:35:06 obrien Exp $ # -DISTNAME= ocaml-2.02 +DISTNAME= ocaml-2.04 CATEGORIES= lang MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/ \ ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/ diff -ruN ocaml.old/files/md5 ocaml.new/files/md5 --- ocaml.old/files/md5 Fri Feb 11 21:40:06 2000 +++ ocaml.new/files/md5 Fri Feb 11 15:43:05 2000 @@ -1,3 +1,3 @@ -MD5 (ocaml-2.02.tar.gz) = 164765dc8093727903f4111500fb30cc -MD5 (ocaml-2.02-refman.ps.gz) = af6bae149d72674d50ab115e38dcf90c -MD5 (ocaml-2.02-refman.html.tar.gz) = d8558bcf77a9c8600576d02846eaff5d +MD5 (ocaml-2.04.tar.gz) = e7eb206d2f7ee6e1aca0ab07d1f4dc20 +MD5 (ocaml-2.04-refman.html.tar.gz) = b5f06bbf3f602fd9ea0cddf7a1f2cfe4 +MD5 (ocaml-2.04-refman.ps.gz) = 7e162fc434f1ab36fdbad896ce935779 diff -ruN ocaml.old/patches/patch-aa ocaml.new/patches/patch-aa --- ocaml.old/patches/patch-aa Fri Feb 11 21:42:11 2000 +++ ocaml.new/patches/patch-aa Fri Feb 11 17:34:03 2000 @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 18 12:10:51 1998 -+++ configure Sun May 30 19:42:06 1999 -@@ -111,27 +111,27 @@ +--- configure.orig Fri Feb 11 16:15:25 2000 ++++ configure Fri Feb 11 16:27:37 2000 +@@ -135,27 +135,27 @@ # Check for buggy versions of GCC @@ -49,38 +49,35 @@ # Configure the bytecode compiler -@@ -269,6 +269,9 @@ - i[3456]86-*-linuxaout) arch=i386; system=linux_aout;; - i[3456]86-*-linuxoldld) arch=i386; system=linux_aout;; - i[3456]86-*-linux) arch=i386; system=linux_elf;; -+ i[3456]86-*-freebsd2*) arch=i386; system=bsd;; -+ i[3456]86-*-freebsd*) arch=i386; system=freebsd;; -+ alpha-*-freebsd*) arch=alpha; system=freebsd;; - i[3456]86-*-*bsd*) arch=i386; system=bsd;; - i[3456]86-*-nextstep*) arch=i386; system=nextstep;; - i[3456]86-*-solaris*) arch=i386; system=solaris;; -@@ -317,6 +320,7 @@ - sparc,*,*) asppflags='-P -DSYS_$(SYSTEM)';; - i386,*,solaris) asppflags='-P -DSYS_$(SYSTEM)';; - i386,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; +@@ -290,6 +290,7 @@ + case "$host" in + alpha-*-osf*) arch=alpha; system=digital;; + alpha-*-linux*) arch=alpha; system=linux;; ++ alpha-*-freebsd*) arch=alpha; system=freebsd;; + alpha-*-netbsd*) arch=alpha; system=netbsd;; + alpha-*-openbsd*) arch=alpha; system=openbsd;; + sparc-*-sunos4.*) arch=sparc; system=sunos;; +@@ -340,6 +341,7 @@ + alpha,*,digital) asflags='-O2'; asppflags='-O2 -DSYS_$(SYSTEM)'; + asppprofflags='-pg -DPROFILING';; + alpha,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; + alpha,*,freebsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - hppa,*,*) aspp="$cc"; asppflags='-c -DSYS_$(SYSTEM)';; - power,rs6000,aix) asflags='-u -m pwr -w'; asppflags="$asflags";; - power,ppc,aix) asflags='-u -m ppc -w'; asppflags="$asflags";; -@@ -328,6 +332,7 @@ + alpha,*,netbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; + alpha,*,openbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; + mips,*,irix) asflags='-n32 -O2'; asppflags="$asflags";; +@@ -365,6 +367,7 @@ case "$arch,$model,$system" in alpha,*,digital) profiling='prof';; i386,*,linux_elf) profiling='prof';; -+ i386,*,freebsd) profiling='prof';; ++ i386,*,*bsd*) profiling='prof';; *) profiling='noprof';; esac -@@ -610,6 +615,8 @@ - mips-*-ultrix*) bignum_arch=mips;; +@@ -649,6 +652,7 @@ alpha-*-osf*) bignum_arch=alpha;; i[3456]86-*-linux) bignum_arch=x86;; -+ i[3456]86-*-freebsd*) bignum_arch=x86;; -+ alpha-*-freebsd*) bignum_arch=alpha;; + i[3456]86-*-beos) bignum_arch=x86;; ++ i[3456]86-*-*bsd*) bignum_arch=x86;; sparc-*-sunos*) bignum_arch=supersparc;; sparc-*-solaris*) bignum_arch=supersparc-solaris;; sparc-*-*bsd*) bignum_arch=sparc;; diff -ruN ocaml.old/patches/patch-ab ocaml.new/patches/patch-ab --- ocaml.old/patches/patch-ab Fri Feb 11 21:42:11 2000 +++ ocaml.new/patches/patch-ab Fri Feb 11 17:28:36 2000 @@ -1,50 +1,18 @@ ---- asmcomp/i386/emit.mlp.orig Thu Feb 4 11:30:31 1999 -+++ asmcomp/i386/emit.mlp Fri May 7 00:58:25 1999 -@@ -42,12 +42,13 @@ - else !stack_offset + num_stack_slots.(0) * 4 + n * 8 - | Outgoing n -> n - --(* Symbols are prefixed with _, except under Linux with ELF binaries *) -+(* Symbols are prefixed with _, except for ELF binaries *) - - let symbol_prefix = - match Config.system with - "linux_elf" -> "" - | "solaris" -> "" -+ | "freebsd" -> "" - | _ -> "_" - - let emit_symbol s = -@@ -59,6 +60,7 @@ - match Config.system with - "linux_elf" -> ".L" - | "solaris" -> ".L" -+ | "freebsd" -> ".L" - | _ -> "L" - - let emit_label lbl = -@@ -85,7 +87,7 @@ - - let emit_align = - match Config.system with -- "linux_elf" | "solaris" -> -+ "linux_elf" | "solaris" | "freebsd" -> - (fun n -> ` .align {emit_int n}\n`) - | _ -> - (fun n -> ` .align {emit_int(Misc.log2 n)}\n`) -@@ -703,6 +705,15 @@ - ` pushl %ecx\n`; - ` pushl %edx\n`; - ` call {emit_symbol "mcount"}\n`; -+ ` popl %edx\n`; -+ ` popl %ecx\n`; -+ ` popl %eax\n` -+ | "freebsd" -> +--- asmcomp/i386/emit.mlp.orig Fri Feb 11 16:33:42 2000 ++++ asmcomp/i386/emit.mlp Fri Feb 11 16:53:31 2000 +@@ -713,6 +713,15 @@ + ` popl %edx\n`; + ` popl %ecx\n`; + ` popl %eax\n` ++ | "bsd_elf" -> + ` pushl %eax\n`; + ` movl %esp, %ebp\n`; + ` pushl %ecx\n`; + ` pushl %edx\n`; -+ ` call .mcount\n`; - ` popl %edx\n`; - ` popl %ecx\n`; - ` popl %eax\n` ++ ` call .mcount\n`; ++ ` popl %edx\n`; ++ ` popl %ecx\n`; ++ ` popl %eax\n` + | _ -> () (*unsupported yet*) + + (* Emission of a function declaration *) diff -ruN ocaml.old/patches/patch-ac ocaml.new/patches/patch-ac --- ocaml.old/patches/patch-ac Fri Feb 11 21:42:11 2000 +++ ocaml.new/patches/patch-ac Fri Feb 11 17:19:28 2000 @@ -1,15 +1,6 @@ ---- asmrun/i386.S.orig Sun Feb 14 17:48:24 1999 -+++ asmrun/i386.S Fri May 7 01:05:46 1999 -@@ -23,7 +23,7 @@ - #define CONCAT(a,b) a##b - #endif - --#if defined(SYS_linux_elf) || defined(SYS_solaris) -+#if defined(SYS_linux_elf) || defined(SYS_solaris) || defined(SYS_freebsd) - #define G(x) x - #define LBL(x) CONCAT(.L,x) - #define FUNCTION_ALIGN 4 -@@ -33,13 +33,22 @@ +--- asmrun/i386.S.orig Wed Nov 17 19:56:48 1999 ++++ asmrun/i386.S Fri Feb 11 16:51:35 2000 +@@ -35,13 +35,22 @@ #define FUNCTION_ALIGN 2 #endif @@ -22,7 +13,7 @@ popl %edx; popl %ecx; popl %eax; popl %ebp #define PROFILE_C \ pushl %ebp; movl %esp, %ebp; call mcount; popl %ebp -+#elif defined(SYS_freebsd) ++#elif defined(SYS_bsd_elf) +#define PROFILE_CAML \ + pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \ + call .mcount; \ diff -ruN ocaml.old/patches/patch-ad ocaml.new/patches/patch-ad --- ocaml.old/patches/patch-ad Fri Feb 11 21:42:11 2000 +++ ocaml.new/patches/patch-ad Fri Feb 11 17:20:20 2000 @@ -1,5 +1,5 @@ ---- otherlibs/num/bignum/Makefile.orig Sun May 30 19:13:20 1999 -+++ otherlibs/num/bignum/Makefile Sun May 30 19:13:44 1999 +--- otherlibs/num/bignum/Makefile.orig Thu Dec 4 19:07:35 1997 ++++ otherlibs/num/bignum/Makefile Fri Feb 11 16:54:51 2000 @@ -73,7 +73,7 @@ $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all diff -ruN ocaml.old/patches/patch-ae ocaml.new/patches/patch-ae --- ocaml.old/patches/patch-ae Fri Feb 11 21:42:11 2000 +++ ocaml.new/patches/patch-ae Fri Feb 11 17:20:56 2000 @@ -1,10 +1,11 @@ ---- asmcomp/alpha/emit.mlp.orig Sun May 30 19:52:58 1999 -+++ asmcomp/alpha/emit.mlp Sun May 30 19:54:52 1999 -@@ -274,6 +274,7 @@ +--- asmcomp/alpha/emit.mlp.orig Fri Feb 11 16:55:21 2000 ++++ asmcomp/alpha/emit.mlp Fri Feb 11 16:56:28 2000 +@@ -274,7 +274,7 @@ + let rdata_section = match Config.system with - "digital" -> ".rdata" - | "linux" -> ".section .rodata" -+ | "freebsd" -> ".section .rodata" - | _ -> assert false + "digital" | "openbsd" -> ".rdata" +- | "linux" | "netbsd" -> ".section .rodata" ++ | "linux" | "netbsd" "freebsd" -> ".section .rodata" + | _ -> assert false (* Names of various instructions *) diff -ruN ocaml.old/patches/patch-af ocaml.new/patches/patch-af --- ocaml.old/patches/patch-af Thu Jan 1 01:00:00 1970 +++ ocaml.new/patches/patch-af Fri Feb 11 18:00:30 2000 @@ -0,0 +1,10 @@ +--- otherlibs/graph/open.c.orig Fri Feb 11 18:00:12 2000 ++++ otherlibs/graph/open.c Fri Feb 11 17:59:18 2000 +@@ -13,6 +13,7 @@ + /* $Id: open.c,v 1.12 1999/11/18 13:33:53 xleroy Exp $ */ + + #include <fcntl.h> ++#include <unistd.h> + #include <signal.h> + #include "libgraph.h" + #include <alloc.h> diff -ruN ocaml.old/patches/patch-ag ocaml.new/patches/patch-ag --- ocaml.old/patches/patch-ag Thu Jan 1 01:00:00 1970 +++ ocaml.new/patches/patch-ag Fri Feb 11 18:34:48 2000 @@ -0,0 +1,10 @@ +--- byterun/config.h.orig Fri Feb 11 18:34:29 2000 ++++ byterun/config.h Fri Feb 11 18:34:06 2000 +@@ -27,6 +27,7 @@ + + #ifdef HAS_MEMMOVE + #undef bcopy ++#include <string.h> + #define bcopy(src,dst,len) memmove((dst), (src), (len)) + #else + #ifdef HAS_BCOPY >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002112055.VAA91249>