Date: Wed, 30 Nov 2005 23:56:37 +0100 From: "Marwan Burelle" <burelle@lri.fr> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/89779: [maintainer update] lang/ocaml : upgrade to 3.09 Message-ID: <1133391397.0@melkor.kh405.net> Resent-Message-ID: <200511302300.jAUN0Ddl075216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89779
>Category: ports
>Synopsis: [maintainer update] lang/ocaml : upgrade to 3.09
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 30 23:00:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marwan Burelle
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.0-RELEASE #0: Fri Nov 18 19:48:43 CET 2005
root@melkor.kh405.net:/usr/obj/usr/src/sys/Ker_Melkor
>Description:
Upgrade to the last release.
Beware, upgrade of OCaml compiler implies rebuild of all ocaml librairies due to binary incompatibility at link time (standalone binaries are not concern since they are staticaly linked.)
>How-To-Repeat:
>Fix:
--- patch.ocaml309 begins here ---
diff -ruN ocaml.orig/Makefile ocaml/Makefile
--- ocaml.orig/Makefile Wed Nov 30 22:57:00 2005
+++ ocaml/Makefile Wed Nov 23 15:35:20 2005
@@ -6,8 +6,7 @@
#
PORTNAME= ocaml
-PORTVERSION= 3.08.3
-PORTREVISION= 2
+PORTVERSION= 3.09.0
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \
ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -67,7 +66,8 @@
Scanf.n Set.Make.n Set.OrderedType.n Set.S.n Set.n Sort.n \
Stack.n StdLabels.Array.n StdLabels.List.n StdLabels.String.n \
StdLabels.n Str.n Stream.n String.n StringLabels.n Sys.n \
- Unix.LargeFile.n Unix.n Weak.Make.n Weak.S.n Weak.n
+ Unix.LargeFile.n Unix.n Weak.Make.n Weak.S.n Weak.n \
+ CamlinternalMod.n
MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1 \
camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \
@@ -89,7 +89,7 @@
.include <bsd.port.pre.mk>
.if ${ARCH} == sparc64 || ${ARCH} == ia64
-BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix
+BROKEN= "ocamlc.opt seg-faults on ${ARCH}, please try to fix"
.endif
PLIST_SUB+= PROF=""
diff -ruN ocaml.orig/distinfo ocaml/distinfo
--- ocaml.orig/distinfo Wed Nov 30 22:57:00 2005
+++ ocaml/distinfo Wed Nov 23 14:21:13 2005
@@ -1,2 +1,2 @@
-MD5 (ocaml-3.08.3.tar.bz2) = 8277bb1537051fe5151dc31c350d64cd
-SIZE (ocaml-3.08.3.tar.bz2) = 2055260
+MD5 (ocaml-3.09.0.tar.bz2) = 834f88b1f39aa066bb620747764c0588
+SIZE (ocaml-3.09.0.tar.bz2) = 2013495
diff -ruN ocaml.orig/files/patch-configure ocaml/files/patch-configure
--- ocaml.orig/files/patch-configure Wed Nov 30 22:57:00 2005
+++ ocaml/files/patch-configure Wed Nov 23 14:21:12 2005
@@ -1,7 +1,6 @@
---- configure.orig Thu Jul 15 16:17:46 2004
-+++ configure Thu Jul 15 16:58:51 2004
-@@ -652,7 +652,8 @@
- case "$arch,$model,$system" in
+--- configure.orig Wed Sep 7 12:41:56 2005
++++ configure Wed Sep 7 12:30:03 2005
+@@ -653,6 +653,7 @@
alpha,*,digital) profiling='prof';;
i386,*,linux_elf) profiling='prof';;
i386,*,bsd_elf) profiling='prof';;
@@ -9,7 +8,7 @@
sparc,*,solaris)
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
-@@ -1113,116 +1113,14 @@
+@@ -1123,117 +1124,14 @@
x11_include="not found"
x11_link="not found"
@@ -72,6 +71,7 @@
- $x11_lib_dir \
- $x11_try_lib_dir \
- \
+- /usr/X11R6/lib64 \
- /usr/X11R6/lib \
- /usr/lib/X11R6 \
- /usr/local/X11R6/lib \
diff -ruN ocaml.orig/pkg-plist ocaml/pkg-plist
--- ocaml.orig/pkg-plist Wed Nov 30 22:57:00 2005
+++ ocaml/pkg-plist Wed Nov 23 15:16:01 2005
@@ -11,6 +11,7 @@
bin/ocamlrun
bin/ocamlyacc
bin/ocpp
+lib/ocaml/Makefile.config
lib/ocaml/addlabels
lib/ocaml/arg.cmi
lib/ocaml/arg.cmx
@@ -65,6 +66,11 @@
lib/ocaml/caml/signals.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
+lib/ocaml/camlinternalMod.cmi
+lib/ocaml/camlinternalMod.cmx
+lib/ocaml/camlinternalMod.ml
+lib/ocaml/camlinternalMod.mli
+lib/ocaml/camlinternalMod.p.cmx
lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.cmx
lib/ocaml/camlinternalOO.ml
@@ -588,6 +594,16 @@
%%TK%%lib/ocaml/labltk/wm.cmi
%%TK%%lib/ocaml/labltk/wm.cmx
%%TK%%lib/ocaml/labltk/wm.mli
+%%TK%%lib/ocaml/labltk/fileevent.cmx
+%%TK%%lib/ocaml/labltk/protocol.cmx
+%%TK%%lib/ocaml/labltk/rawwidget.cmx
+%%TK%%lib/ocaml/labltk/textvariable.cmx
+%%TK%%lib/ocaml/labltk/timer.cmx
+%%TK%%lib/ocaml/labltk/tkthread.cmi
+%%TK%%lib/ocaml/labltk/tkthread.cmo
+%%TK%%lib/ocaml/labltk/tkthread.mli
+%%TK%%lib/ocaml/labltk/tkthread.o
+%%TK%%lib/ocaml/labltk/widget.cmx
lib/ocaml/lazy.cmi
lib/ocaml/lazy.cmx
lib/ocaml/lazy.ml
@@ -809,7 +825,6 @@
lib/ocaml/stringLabels.ml
lib/ocaml/stringLabels.mli
%%PROF%%lib/ocaml/stringLabels.p.cmx
-lib/ocaml/string_misc.cmx
lib/ocaml/stublibs/dllbigarray.so
%%X11%%lib/ocaml/stublibs/dllgraphics.so
%%TK%%lib/ocaml/stublibs/dlllabltk.so
--- patch.ocaml309 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1133391397.0>