Attachment 93029 Details for Bug 130845 – file.diff

[patch] file.diff

file.diff (text/plain), 6.92 KB, created by Hirohisa Yamaguchi on 2009-01-21 22:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2009-01-21 22:40:03 UTC

Size: 6.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/Makefile,v
>retrieving revision 1.61
>diff -p -u -r1.61 Makefile
>--- Makefile	19 Apr 2008 17:51:31 -0000	1.61
>+++ Makefile	21 Jan 2009 22:29:30 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	ocaml
>-PORTVERSION=	3.10.2
>-PORTREVISION=	1
>+PORTVERSION=	3.11.0
> CATEGORIES=	lang
> MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
> 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/distinfo,v
>retrieving revision 1.23
>diff -p -u -r1.23 distinfo
>--- distinfo	6 Apr 2008 19:44:40 -0000	1.23
>+++ distinfo	21 Jan 2009 22:29:30 -0000
>@@ -1,3 +1,3 @@
>-MD5 (ocaml-3.10.2.tar.bz2) = d86f8f8aa4574fa60dd6f89044580307
>-SHA256 (ocaml-3.10.2.tar.bz2) = 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
>-SIZE (ocaml-3.10.2.tar.bz2) = 2284860
>+MD5 (ocaml-3.11.0.tar.bz2) = 6ed1c3ed660a15408362242fa8fa4668
>+SHA256 (ocaml-3.11.0.tar.bz2) = 3faa9057bdac916413a5dee17180f5a8fbc7fb7589465208f72f692bddbd6776
>+SIZE (ocaml-3.11.0.tar.bz2) = 2359311
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/pkg-plist,v
>retrieving revision 1.31
>diff -p -u -r1.31 pkg-plist
>--- pkg-plist	6 Apr 2008 19:44:40 -0000	1.31
>+++ pkg-plist	21 Jan 2009 22:29:30 -0000
>@@ -66,6 +66,7 @@ lib/ocaml/bigarray.cma
> lib/ocaml/bigarray.cmi
> lib/ocaml/bigarray.cmx
> lib/ocaml/bigarray.cmxa
>+lib/ocaml/bigarray.cmxs
> lib/ocaml/bigarray.mli
> lib/ocaml/buffer.cmi
> lib/ocaml/buffer.cmx
>@@ -93,6 +94,11 @@ lib/ocaml/caml/signals.h
> lib/ocaml/caml/unixsupport.h
> lib/ocaml/camlheader
> lib/ocaml/camlheader_ur
>+lib/ocaml/camlinternalLazy.cmi
>+lib/ocaml/camlinternalLazy.cmx
>+lib/ocaml/camlinternalLazy.ml
>+lib/ocaml/camlinternalLazy.mli
>+lib/ocaml/camlinternalLazy.p.cmx
> lib/ocaml/camlinternalMod.cmi
> lib/ocaml/camlinternalMod.cmx
> lib/ocaml/camlinternalMod.ml
>@@ -136,10 +142,6 @@ lib/ocaml/camlp4/Camlp4Filters/Camlp4Pro
> lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
> lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
> lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
>-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmi
>-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmo
>-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmx
>-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.o
> lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
> lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
> lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
>@@ -268,14 +270,18 @@ lib/ocaml/dbm.cma
> lib/ocaml/dbm.cmi
> lib/ocaml/dbm.cmx
> lib/ocaml/dbm.cmxa
>+lib/ocaml/dbm.cmxs
> lib/ocaml/dbm.mli
> lib/ocaml/digest.cmi
> lib/ocaml/digest.cmx
> lib/ocaml/digest.ml
> lib/ocaml/digest.mli
> lib/ocaml/digest.p.cmx
>+lib/ocaml/dynlink.a
> lib/ocaml/dynlink.cma
> lib/ocaml/dynlink.cmi
>+lib/ocaml/dynlink.cmx
>+lib/ocaml/dynlink.cmxa
> lib/ocaml/dynlink.mli
> lib/ocaml/event.mli
> lib/ocaml/expunge
>@@ -305,8 +311,10 @@ lib/ocaml/genlex.p.cmx
> %%X11%%lib/ocaml/graphics.cmi
> %%X11%%lib/ocaml/graphics.cmx
> %%X11%%lib/ocaml/graphics.cmxa
>+%%X11%%lib/ocaml/graphics.cmxs
> %%X11%%lib/ocaml/graphics.mli
> %%X11%%lib/ocaml/graphicsX11.cmi
>+%%X11%%lib/ocaml/graphicsX11.cmx
> %%X11%%lib/ocaml/graphicsX11.mli
> lib/ocaml/hashtbl.cmi
> lib/ocaml/hashtbl.cmx
>@@ -664,6 +672,7 @@ lib/ocaml/libasmrun.a
> lib/ocaml/libasmrunp.a
> lib/ocaml/libbigarray.a
> lib/ocaml/libcamlrun.a
>+lib/ocaml/libcamlrun_shared.so
> %%X11%%lib/ocaml/libgraphics.a
> lib/ocaml/libmldbm.a
> lib/ocaml/libnums.a
>@@ -711,6 +720,7 @@ lib/ocaml/num.mli
> lib/ocaml/nums.a
> lib/ocaml/nums.cma
> lib/ocaml/nums.cmxa
>+lib/ocaml/nums.cmxs
> lib/ocaml/obj.cmi
> lib/ocaml/obj.cmx
> lib/ocaml/obj.ml
>@@ -870,6 +880,7 @@ lib/ocaml/str.cma
> lib/ocaml/str.cmi
> lib/ocaml/str.cmx
> lib/ocaml/str.cmxa
>+lib/ocaml/str.cmxs
> lib/ocaml/str.mli
> lib/ocaml/stream.cmi
> lib/ocaml/stream.cmx
>@@ -926,6 +937,7 @@ lib/ocaml/unix.cma
> lib/ocaml/unix.cmi
> lib/ocaml/unix.cmx
> lib/ocaml/unix.cmxa
>+lib/ocaml/unix.cmxs
> lib/ocaml/unix.mli
> lib/ocaml/unixLabels.cmi
> lib/ocaml/unixLabels.cmx
>cvs diff: Diffing files
>Index: files/mann
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/files/mann,v
>retrieving revision 1.1
>diff -p -u -r1.1 mann
>--- files/mann	2 Aug 2006 14:00:20 -0000	1.1
>+++ files/mann	21 Jan 2009 22:29:30 -0000
>@@ -79,3 +79,4 @@ Weak.Make.n
> Weak.S.n
> Weak.n
> CamlinternalMod.n
>+CamlinternalLazy.n
>Index: files/patch-camlp4-man_Makefile
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/files/patch-camlp4-man_Makefile,v
>retrieving revision 1.1
>diff -p -u -r1.1 patch-camlp4-man_Makefile
>--- files/patch-camlp4-man_Makefile	2 Aug 2006 14:00:20 -0000	1.1
>+++ files/patch-camlp4-man_Makefile	21 Jan 2009 22:29:30 -0000
>@@ -1,14 +1,14 @@
>---- ./camlp4/man/Makefile.orig	Thu Jul  3 20:14:49 2003
>-+++ ./camlp4/man/Makefile	Sun May 21 14:02:41 2006
>+--- ./camlp4/man/Makefile.orig	2008-10-27 23:03:31.000000000 +0900
>++++ ./camlp4/man/Makefile	2009-01-21 01:35:26.000000000 +0900
> @@ -3,7 +3,6 @@
>- include ../config/Makefile
>+ include ../config/Makefile.cnf
>  
>  TARGET=camlp4.1
> -ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
>  
>- all: $(TARGET)
>+ include ../config/Makefile.base
>  
>-@@ -18,10 +17,6 @@
>+@@ -11,10 +10,6 @@
>  	if test -n '$(MANDIR)'; then \
>  	  $(MKDIR) $(MANDIR)/man1 ; \
>  	  cp $(TARGET) $(MANDIR)/man1/. ; \
>Index: files/patch-configure
>===================================================================
>RCS file: /home/ncvs/ports/lang/ocaml/files/patch-configure,v
>retrieving revision 1.9
>diff -p -u -r1.9 patch-configure
>--- files/patch-configure	6 Apr 2008 19:44:41 -0000	1.9
>+++ files/patch-configure	21 Jan 2009 22:29:31 -0000
>@@ -1,6 +1,6 @@
>---- configure.orig	2008-01-04 16:26:38.000000000 +0300
>-+++ configure	2008-04-06 23:16:20.000000000 +0400
>-@@ -79,6 +79,8 @@
>+--- ./configure.orig	2008-11-07 19:34:16.000000000 +0900
>++++ ./configure	2009-01-21 01:41:11.000000000 +0900
>+@@ -85,6 +85,8 @@
>          withcurses=no;;
>      -no-shared-libs)
>          withsharedlibs=no;;
>@@ -9,15 +9,15 @@
>      -x11include*|--x11include*)
>          x11_include_dir=$2; shift;;
>      -x11lib*|--x11lib*)
>-@@ -686,6 +688,7 @@
>-   i386,*,gnu) profiling='prof';;
>+@@ -739,6 +741,7 @@
>    i386,*,bsd_elf) profiling='prof';;
>+   amd64,*,macosx) profiling='prof';;
>    i386,*,macosx) profiling='prof';;
> +  *,*,freebsd) profiling='prof';;
>    sparc,*,solaris)
>      profiling='prof'
>      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
>-@@ -1132,124 +1135,24 @@
>+@@ -1183,127 +1186,24 @@
>  x11_include="not found"
>  x11_link="not found"
>  
>@@ -129,8 +129,11 @@
> -    if test $dir = /usr/lib; then
> -      x11_link="-lX11"
> -    else
>--      x11_link="-L$dir -lX11"
> -      x11_libs="-L$dir"
>+-      case "$host" in
>+-        *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
>+-        *) x11_link="-L$dir -lX11";;
>+-      esac
> -    fi
> -    break
> -  fi

Actions: View | Diff

Attachments on bug 130845: 93029 | 93030 | 93031 | 93032