[Midnightbsd-cvs] mports [17312] trunk/lang/ocaml: ocaml 4.01
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 19:46:56 EDT 2014
Revision: 17312
http://svnweb.midnightbsd.org/mports/?rev=17312
Author: laffer1
Date: 2014-09-15 19:46:55 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
ocaml 4.01
Modified Paths:
--------------
trunk/lang/ocaml/Makefile
trunk/lang/ocaml/distinfo
trunk/lang/ocaml/files/patch-camlp4-man_Makefile
trunk/lang/ocaml/files/patch-configure
trunk/lang/ocaml/files/patch-ocamldoc_Makefile
trunk/lang/ocaml/pkg-plist
Added Paths:
-----------
trunk/lang/ocaml/files/edit_pkg-plist.sed
trunk/lang/ocaml/files/manfiles
trunk/lang/ocaml/files/patch-Makefile
trunk/lang/ocaml/files/patch-asmcomp__arm__arch.ml
trunk/lang/ocaml/files/patch-asmrun-Makefile
trunk/lang/ocaml/files/patch-asmrun__arm.S
trunk/lang/ocaml/files/patch-byterun-Makefile.common
trunk/lang/ocaml/files/patch-config-auto-aux-async_io.c
trunk/lang/ocaml/files/patch-ocamlbuild
trunk/lang/ocaml/files/patch-otherlibs-Makefile.shared
trunk/lang/ocaml/files/patch-otherlibs-dynlink-Makefile
trunk/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile
trunk/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile
trunk/lang/ocaml/files/patch-otherlibs-systhreads-Makefile
trunk/lang/ocaml/files/patch-otherlibs-threads-Makefile
trunk/lang/ocaml/files/patch-stdlib-Makefile
Removed Paths:
-------------
trunk/lang/ocaml/files/man1
trunk/lang/ocaml/files/manlinks
trunk/lang/ocaml/files/mann
Property Changed:
----------------
trunk/lang/ocaml/files/patch-camlp4-man_Makefile
trunk/lang/ocaml/files/patch-configure
trunk/lang/ocaml/files/patch-ocamldoc_Makefile
Modified: trunk/lang/ocaml/Makefile
===================================================================
--- trunk/lang/ocaml/Makefile 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,27 +1,32 @@
# $MidnightBSD$
PORTNAME= ocaml
-PORTVERSION= 3.12.1
-PORTREVISION= 2
+PORTVERSION= 4.01.0
+PORTREVISION= 0
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \
- ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
- ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME:R}/ \
+MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
PKGNAMESUFFIX= ${SFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= ports at MidnightBSD.org
COMMENT?= Objective Caml compiler and programming environment
-LICENSE= other
+LICENSE= QPL10 lgpl
+LICENSE_COMB= multi
+LICENSE_NAME_QPL10= Q Public License, Version 1.0
+LICENSE_FILE_QPL10= ${WRKSRC}/LICENSE
+LICENSE_PERMS_QPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= tar:bzip2
+USES= gmake tar:bzip2
REINPLACE_ARGS= -i ""
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
ALL_TARGET= world.opt
STRIP=
+SSP_UNSAFE= yes
MAKE_JOBS_UNSAFE= yes
CONFIGURE_ARGS= -prefix ${PREFIX} -host ${MACHINE_ARCH}-portbld-freebsd6.0
@@ -84,10 +89,6 @@
.include <bsd.port.pre.mk>
-MAN1!= ${CAT} ${FILESDIR}/man1
-MANN!= ${CAT} ${FILESDIR}/mann
-MLINKS!=${CAT} ${FILESDIR}/manlinks
-
.if ${ARCH} == sparc64
BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix
.endif
Modified: trunk/lang/ocaml/distinfo
===================================================================
--- trunk/lang/ocaml/distinfo 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/distinfo 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,3 +1,8 @@
-SHA256 (ocaml-3.12.1.tar.bz2) = edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
-RMD160 (ocaml-3.12.1.tar.bz2) = 61d38c0785491c8790ac02ab78fb2f26ea490fc1
-SIZE (ocaml-3.12.1.tar.bz2) = 2949124
+SHA256 (ocaml-4.01.0.tar.bz2) = b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a
+SIZE (ocaml-4.01.0.tar.bz2) = 3691090
+SHA256 (ocaml-4.01-refman-html.tar.gz) = 01019c8f8a29a8a7f422e090704b666ade2a007d57ea9412285f88f716656001
+SIZE (ocaml-4.01-refman-html.tar.gz) = 571422
+SHA256 (ocaml-4.01-refman.ps.gz) = 4de67ef967b8b39a6f030df258087239d6f7dee869a3973d7a782b7986b809c6
+SIZE (ocaml-4.01-refman.ps.gz) = 1089703
+SHA256 (ocaml-4.01-refman.pdf) = 389e434f534153530ba234299d0f3a0e4271d18b091b9216e4a37335ebd33424
+SIZE (ocaml-4.01-refman.pdf) = 1478900
Added: trunk/lang/ocaml/files/edit_pkg-plist.sed
===================================================================
--- trunk/lang/ocaml/files/edit_pkg-plist.sed (rev 0)
+++ trunk/lang/ocaml/files/edit_pkg-plist.sed 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,9 @@
+/\.p\.cmx$/s@^@%%PROF%%@
+/examples_labeltk/{
+ s at share/examples@%%EXAMPLESDIR%%@
+ s@^@%%TK%%@
+}
+/graphics/s@^@%%X11%%@
+/labltk/s@^@%%TK%%@
+/ocamlbrowser/s@^@%%TK%%@
+/dlllabltk.so/s@^@%%TK%%@
Deleted: trunk/lang/ocaml/files/man1
===================================================================
--- trunk/lang/ocaml/files/man1 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/man1 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,13 +0,0 @@
-ocaml.1
-ocamlbuild.1
-ocamlc.1
-ocamlcp.1
-ocamldebug.1
-ocamldep.1
-ocamldoc.1
-ocamllex.1
-ocamlmktop.1
-ocamlopt.1
-ocamlprof.1
-ocamlrun.1
-ocamlyacc.1
Added: trunk/lang/ocaml/files/manfiles
===================================================================
--- trunk/lang/ocaml/files/manfiles (rev 0)
+++ trunk/lang/ocaml/files/manfiles 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,101 @@
+MAN1= ocaml.1 \
+ ocamlbuild.1 \
+ ocamlc.1 \
+ ocamlcp.1 \
+ ocamldebug.1 \
+ ocamldep.1 \
+ ocamldoc.1 \
+ ocamllex.1 \
+ ocamlmktop.1 \
+ ocamlopt.1 \
+ ocamloptp.1 \
+ ocamlprof.1 \
+ ocamlrun.1 \
+ ocamlyacc.1
+
+MANN= Arg.3o \
+ Array.3o \
+ ArrayLabels.3o \
+ Bigarray.3o \
+ Bigarray.Array1.3o \
+ Bigarray.Array2.3o \
+ Bigarray.Array3.3o \
+ Bigarray.Genarray.3o \
+ Buffer.3o \
+ Callback.3o \
+ CamlinternalLazy.3o \
+ CamlinternalMod.3o \
+ CamlinternalOO.3o \
+ Complex.3o \
+ Digest.3o \
+ Filename.3o \
+ Format.3o \
+ Gc.3o \
+ Genlex.3o \
+ Hashtbl.3o \
+ Hashtbl.HashedType.3o \
+ Hashtbl.Make.3o \
+ Hashtbl.MakeSeeded.3o \
+ Hashtbl.S.3o \
+ Hashtbl.SeededHashedType.3o \
+ Hashtbl.SeededS.3o \
+ Int32.3o \
+ Int64.3o \
+ Lexing.3o \
+ List.3o \
+ ListLabels.3o \
+ Map.3o \
+ Map.Make.3o \
+ Map.OrderedType.3o \
+ Map.S.3o \
+ Marshal.3o \
+ MoreLabels.3o \
+ MoreLabels.Hashtbl.3o \
+ MoreLabels.Hashtbl.HashedType.3o \
+ MoreLabels.Hashtbl.Make.3o \
+ MoreLabels.Hashtbl.MakeSeeded.3o \
+ MoreLabels.Hashtbl.S.3o \
+ MoreLabels.Hashtbl.SeededHashedType.3o \
+ MoreLabels.Hashtbl.SeededS.3o \
+ MoreLabels.Map.3o \
+ MoreLabels.Map.Make.3o \
+ MoreLabels.Map.OrderedType.3o \
+ MoreLabels.Map.S.3o \
+ MoreLabels.Set.3o \
+ MoreLabels.Set.Make.3o \
+ MoreLabels.Set.OrderedType.3o \
+ MoreLabels.Set.S.3o \
+ Nativeint.3o \
+ Num.3o \
+ Obj.3o \
+ Oo.3o \
+ Parsing.3o \
+ Pervasives.3o \
+ Pervasives.LargeFile.3o \
+ Printexc.3o \
+ Printf.3o \
+ Queue.3o \
+ Random.3o \
+ Random.State.3o \
+ Scanf.3o \
+ Scanf.Scanning.3o \
+ Set.Make.3o \
+ Set.OrderedType.3o \
+ Set.S.3o \
+ Sort.3o \
+ Stack.3o \
+ StdLabels.3o \
+ StdLabels.Array.3o \
+ StdLabels.List.3o \
+ StdLabels.String.3o \
+ Str.3o \
+ Stream.3o \
+ StringLabels.3o \
+ Sys.3o \
+ Unix.3o \
+ Unix.LargeFile.3o \
+ Weak.3o \
+ Weak.Make.3o \
+ Weak.S.3o
+
+MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1
Deleted: trunk/lang/ocaml/files/manlinks
===================================================================
--- trunk/lang/ocaml/files/manlinks 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/manlinks 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,4 +0,0 @@
-ocamlc.1
-ocamlc.opt.1
-ocamlopt.1
-ocamlopt.opt.1
Deleted: trunk/lang/ocaml/files/mann
===================================================================
--- trunk/lang/ocaml/files/mann 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/mann 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,82 +0,0 @@
-Arg.n
-Array.n
-ArrayLabels.n
-Bigarray.Array1.n
-Bigarray.Array2.n
-Bigarray.Array3.n
-Bigarray.Genarray.n
-Bigarray.n
-Buffer.n
-Callback.n
-CamlinternalOO.n
-Char.n
-Complex.n
-Digest.n
-Filename.n
-Format.n
-Gc.n
-Genlex.n
-Hashtbl.HashedType.n
-Hashtbl.Make.n
-Hashtbl.S.n
-Hashtbl.n
-Int32.n
-Int64.n
-Lazy.n
-Lexing.n
-List.n
-ListLabels.n
-Map.Make.n
-Map.OrderedType.n
-Map.S.n
-Map.n
-Marshal.n
-MoreLabels.Hashtbl.HashedType.n
-MoreLabels.Hashtbl.Make.n
-MoreLabels.Hashtbl.S.n
-MoreLabels.Hashtbl.n
-MoreLabels.Map.Make.n
-MoreLabels.Map.OrderedType.n
-MoreLabels.Map.S.n
-MoreLabels.Map.n
-MoreLabels.Set.Make.n
-MoreLabels.Set.OrderedType.n
-MoreLabels.Set.S.n
-MoreLabels.Set.n
-MoreLabels.n
-Nativeint.n
-Num.n
-Obj.n
-Oo.n
-Parsing.n
-Pervasives.LargeFile.n
-Pervasives.n
-Printexc.n
-Printf.n
-Queue.n
-Random.n
-Random.State.n
-Scanf.Scanning.n
-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
-CamlinternalMod.n
-CamlinternalLazy.n
Added: trunk/lang/ocaml/files/patch-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,28 @@
+--- Makefile.orig 2013-06-17 15:15:18.000000000 +0200
++++ Makefile 2014-04-01 08:23:13.000000000 +0200
+@@ -298,7 +298,7 @@
+ if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
+ else :; fi
+ cp config/Makefile $(LIBDIR)/Makefile.config
+- BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
++ BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) PREFIX=$(PREFIX) \
+ ./build/partial-install.sh
+
+ # Installation of the native-code compiler
+@@ -318,14 +318,14 @@
+ cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
+ cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
+ cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
++ $(RANLIB) compilerlibs/ocamlcommon.a compilerlibs/ocamlbytecomp.a \
++ compilerlibs/ocamloptcomp.a
+ cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
+ compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
+ compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
+ $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
+ $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
+ $(COMPLIBDIR)
+- cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
+- ocamloptcomp.a
+
+ clean:: partialclean
+
Added: trunk/lang/ocaml/files/patch-asmcomp__arm__arch.ml
===================================================================
--- trunk/lang/ocaml/files/patch-asmcomp__arm__arch.ml (rev 0)
+++ trunk/lang/ocaml/files/patch-asmcomp__arm__arch.ml 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,11 @@
+--- ./asmcomp/arm/arch.ml.orig 2014-04-28 13:12:11.000000000 +0100
++++ ./asmcomp/arm/arch.ml 2014-04-28 13:12:36.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ let abi =
+ match Config.system with
+- "linux_eabi" -> EABI
++ "linux_eabi" | "freebsd" -> EABI
+ | "linux_eabihf" -> EABI_HF
+ | _ -> assert false
+
Added: trunk/lang/ocaml/files/patch-asmrun-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-asmrun-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-asmrun-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,25 @@
+--- asmrun/Makefile.orig 2013-06-24 10:16:27.000000000 +0200
++++ asmrun/Makefile 2014-04-01 07:12:29.000000000 +0200
+@@ -64,14 +64,12 @@
+
+ install-default:
+ cp libasmrun.a $(LIBDIR)/libasmrun.a
+- cd $(LIBDIR); $(RANLIB) libasmrun.a
+
+ install-noruntimed:
+ .PHONY: install-noruntimed
+
+ install-runtimed:
+ cp libasmrund.a $(LIBDIR)/libasmrund.a
+- cd $(LIBDIR); $(RANLIB) libasmrund.a
+ .PHONY: install-runtimed
+
+ install-noprof:
+@@ -79,7 +77,6 @@
+
+ install-prof:
+ cp libasmrunp.a $(LIBDIR)/libasmrunp.a
+- cd $(LIBDIR); $(RANLIB) libasmrunp.a
+
+ power-bsd_elf.S: power-elf.S
+ cp power-elf.S power-bsd_elf.S
Added: trunk/lang/ocaml/files/patch-asmrun__arm.S
===================================================================
--- trunk/lang/ocaml/files/patch-asmrun__arm.S (rev 0)
+++ trunk/lang/ocaml/files/patch-asmrun__arm.S 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,18 @@
+--- ./asmrun/arm.S.orig 2014-04-28 13:10:19.000000000 +0100
++++ ./asmrun/arm.S 2014-04-28 13:10:42.000000000 +0100
+@@ -44,6 +44,15 @@
+ cmp \reg, #0
+ beq \lbl
+ .endm
++#elif defined(SYS_freebsd)
++ .arch armv6
++ .arm
++
++ /* Compatibility macros */
++ .macro cbz reg, lbl
++ cmp \reg, #0
++ beq \lbl
++ .endm
+ #endif
+
+ trap_ptr .req r8
Added: trunk/lang/ocaml/files/patch-byterun-Makefile.common
===================================================================
--- trunk/lang/ocaml/files/patch-byterun-Makefile.common (rev 0)
+++ trunk/lang/ocaml/files/patch-byterun-Makefile.common 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,10 @@
+--- byterun/Makefile.common.orig 2014-04-01 07:13:45.000000000 +0200
++++ byterun/Makefile.common 2014-04-01 07:13:58.000000000 +0200
+@@ -51,7 +51,6 @@
+ install::
+ cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
+ cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A)
+- cd $(LIBDIR); $(RANLIB) libcamlrun.$(A)
+ if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
+ for i in $(PUBLIC_INCLUDES); do \
+ sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \
Modified: trunk/lang/ocaml/files/patch-camlp4-man_Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-camlp4-man_Makefile 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/patch-camlp4-man_Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,6 +1,6 @@
---- camlp4/man/Makefile.orig 2010-11-04 21:04:51.000000000 +0800
-+++ camlp4/man/Makefile 2010-11-04 21:05:14.000000000 +0800
-@@ -3,7 +3,6 @@
+--- camlp4/man/Makefile.orig 2012-07-17 11:31:12.000000000 -0400
++++ camlp4/man/Makefile 2013-11-21 03:16:26.000000000 -0500
+@@ -14,7 +14,6 @@
include ../config/Makefile.cnf
TARGET=camlp4.1
@@ -8,7 +8,7 @@
include ../config/Makefile.base
-@@ -11,10 +10,6 @@
+@@ -22,10 +21,6 @@
if test -n '$(MANDIR)'; then \
$(MKDIR) $(MANDIR)/man1 ; \
cp $(TARGET) $(MANDIR)/man1/. ; \
Property changes on: trunk/lang/ocaml/files/patch-camlp4-man_Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/lang/ocaml/files/patch-config-auto-aux-async_io.c
===================================================================
--- trunk/lang/ocaml/files/patch-config-auto-aux-async_io.c (rev 0)
+++ trunk/lang/ocaml/files/patch-config-auto-aux-async_io.c 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,10 @@
+--- config/auto-aux/async_io.c 2012-11-01 17:36:02.000000000 +0100
++++ config/auto-aux/async_io.c.orig 2012-11-01 17:35:46.000000000 +0100
+@@ -13,7 +13,8 @@
+
+ /* $Id: async_io.c 11156 2011-07-27 14:17:02Z doligez $ */
+
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <signal.h>
Modified: trunk/lang/ocaml/files/patch-configure
===================================================================
--- trunk/lang/ocaml/files/patch-configure 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/patch-configure 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,189 +1,202 @@
---- configure.orig 2010-07-28 06:18:22.000000000 -0700
-+++ configure 2011-04-03 13:46:37.000000000 -0700
-@@ -85,6 +85,8 @@
- withcurses=no;;
- -no-shared-libs)
- withsharedlibs=no;;
-+ -no-x11|--no-x11)
-+ x11_wanted=no;;
- -x11include*|--x11include*)
- x11_include_dir=$2; shift;;
- -x11lib*|--x11lib*)
-@@ -629,6 +631,7 @@
- i686-*-kfreebsd*) natdynlink=true;;
+--- configure.orig 2014-05-08 09:28:26.000000000 +0200
++++ configure 2014-05-08 09:31:54.000000000 +0200
+@@ -545,9 +545,10 @@ if test $withsharedlibs = "yes"; then
+ mksharedlib="$flexlink"
+ mkmaindll="$flexlink -maindll"
+ shared_libraries_supported=true;;
+- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
++ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*| \
++ *-*-dragonfly*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
+ sharedcccompopts="-fPIC"
+- mksharedlib="$bytecc -shared"
++ mksharedlib="$bytecc $bytecclinkopts -shared"
+ bytecclinkopts="$bytecclinkopts -Wl,-E"
+ byteccrpath="-Wl,-rpath,"
+ mksharedlibrpath="-Wl,-rpath,"
+@@ -557,7 +558,7 @@ if test $withsharedlibs = "yes"; then
+ case "$bytecc" in
+ gcc*)
+ sharedcccompopts="-fPIC"
+- mksharedlib="$bytecc -shared"
++ mksharedlib="$bytecc $bytecclinkopts -shared"
+ byteccrpath="-Wl,-rpath,"
+ mksharedlibrpath="-Wl,-rpath,"
+ shared_libraries_supported=true;;
+@@ -573,11 +574,11 @@ if test $withsharedlibs = "yes"; then
+ gcc*)
+ sharedcccompopts="-fPIC"
+ if sh ./solaris-ld; then
+- mksharedlib="$bytecc -shared"
++ mksharedlib="$bytecc $bytecclinkopts -shared"
+ byteccrpath="-R"
+ mksharedlibrpath="-R"
+ else
+- mksharedlib="$bytecc -shared"
++ mksharedlib="$bytecc $bytecclinkopts -shared"
+ bytecclinkopts="$bytecclinkopts -Wl,-E"
+ natdynlinkopts="-Wl,-E"
+ byteccrpath="-Wl,-rpath,"
+@@ -601,12 +602,12 @@ if test $withsharedlibs = "yes"; then
+ mksharedlibrpath="-rpath "
+ shared_libraries_supported=true;;
+ i[3456]86-*-darwin[89].*)
+- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
++ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+ bytecccompopts="$dl_defs $bytecccompopts"
+ dl_needs_underscore=false
+ shared_libraries_supported=true;;
+ *-apple-darwin*)
+- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
++ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
+ bytecccompopts="$dl_defs $bytecccompopts"
+ dl_needs_underscore=false
+ shared_libraries_supported=true;;
+@@ -616,7 +617,7 @@ if test $withsharedlibs = "yes"; then
+ shared_libraries_supported=false;;
+ *-*-openbsd*)
+ sharedcccompopts="-fPIC"
+- mksharedlib="$bytecc -shared"
++ mksharedlib="$bytecc $bytecclinkopts -shared"
+ bytecclinkopts="$bytecclinkopts -Wl,-E"
+ natdynlinkopts="-Wl,-E"
+ byteccrpath="-Wl,-rpath,"
+@@ -651,12 +652,16 @@ if test $withsharedlibs = "yes"; then
x86_64-*-kfreebsd*) natdynlink=true;;
+ i[345]86-*-freebsd*) natdynlink=true;;
+ x86_64-*-freebsd*) natdynlink=true;;
++ i[345]86-*-dragonfly*) natdynlink=true;;
++ x86_64-*-dragonfly*) natdynlink=true;;
+ i[345]86-*-openbsd*) natdynlink=true;;
+ x86_64-*-openbsd*) natdynlink=true;;
+ i[345]86-*-netbsd*) natdynlink=true;;
+ x86_64-*-netbsd*) natdynlink=true;;
i386-*-gnu0.3) natdynlink=true;;
-+ *-*-freebsd*) natdynlink=true;;
+ arm*-*-linux*) natdynlink=true;;
++ arm*-*-freebsd*) natdynlink=true;;
++ powerpc*-*-freebsd*) natdynlink=true;;
esac
fi
-@@ -680,6 +683,7 @@
- hppa*-*-gnu*) arch=hppa; system=gnu;;
+@@ -680,6 +685,7 @@ case "$host" in
+ sparc*-*-gnu*) arch=sparc; system=gnu;;
+ i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;;
+ i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
++ i[3456]86-*-dragonfly*) arch=i386; system=bsd_elf;;
+ i[3456]86-*-nextstep*) arch=i386; system=nextstep;;
+ i[3456]86-*-solaris*) if $arch64; then
+ arch=amd64; system=solaris
+@@ -695,6 +701,7 @@ case "$host" in
+ fi;;
+ i[3456]86-*-gnu*) arch=i386; system=gnu;;
powerpc*-*-linux*) arch=power; model=ppc; system=elf;;
++ powerpc*-*-freebsd*) arch=power; model=ppc; system=bsd_elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
-+ powerpc-*-freebsd*) arch=power; model=ppc; system=bsd;;
+ powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
- powerpc-*-darwin*) arch=power; system=rhapsody
- if $arch64; then model=ppc64; else model=ppc; fi;;
-@@ -789,6 +793,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;;
-@@ -1249,133 +1254,24 @@
- x11_include="not found"
- x11_link="not found"
+@@ -708,12 +715,14 @@ case "$host" in
+ armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;;
+ armv5*-*-linux-gnueabi) arch=arm; model=armv5; system=linux_eabi;;
+ arm*-*-linux-gnueabi) arch=arm; system=linux_eabi;;
++ armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;;
+ x86_64-*-linux*) arch=amd64; system=linux;;
+ x86_64-*-gnu*) arch=amd64; system=gnu;;
+ x86_64-*-freebsd*) arch=amd64; system=freebsd;;
+ x86_64-*-netbsd*) arch=amd64; system=netbsd;;
+ x86_64-*-openbsd*) arch=amd64; system=openbsd;;
+ x86_64-*-darwin*) arch=amd64; system=macosx;;
++ x86_64-*-dragonfly*) arch=amd64; system=dragonfly;;
+ esac
--for dir in \
-- $x11_include_dir \
-- \
-- /usr/X11R7/include \
-- /usr/include/X11R7 \
-- /usr/local/X11R7/include \
-- /usr/local/include/X11R7 \
-- /opt/X11R7/include \
-- \
-- /usr/X11R6/include \
-- /usr/include/X11R6 \
-- /usr/local/X11R6/include \
-- /usr/local/include/X11R6 \
-- /opt/X11R6/include \
-- \
-- /usr/X11/include \
-- /usr/include/X11 \
-- /usr/local/X11/include \
-- /usr/local/include/X11 \
-- /opt/X11/include \
-- \
-- /usr/X11R5/include \
-- /usr/include/X11R5 \
-- /usr/local/X11R5/include \
-- /usr/local/include/X11R5 \
-- /usr/local/x11r5/include \
-- /opt/X11R5/include \
-- \
-- /usr/X11R4/include \
-- /usr/include/X11R4 \
-- /usr/local/X11R4/include \
-- /usr/local/include/X11R4 \
-- \
-- /usr/X386/include \
-- /usr/x386/include \
-- /usr/XFree86/include/X11 \
-- \
-- /usr/include \
-- /usr/local/include \
-- /usr/unsupported/include \
-- /usr/athena/include \
-- /usr/lpp/Xamples/include \
-- \
-- /usr/openwin/include \
-- /usr/openwin/share/include \
-- ; \
--do
-- if test -f $dir/X11/X.h; then
-- x11_include=$dir
-- break
-- fi
--done
--
--if test "$x11_include" = "not found"; then
-- x11_try_lib_dir=''
--else
-- x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
-+if [ -n "$x11_include_dir" ]; then
-+ x11_include="$x11_include_dir"
+ # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
+@@ -734,7 +743,7 @@ else
fi
--for dir in \
-- $x11_lib_dir \
-- $x11_try_lib_dir \
-- \
-- /usr/X11R6/lib64 \
-- /usr/X11R6/lib \
-- /usr/lib/X11R6 \
-- /usr/local/X11R6/lib \
-- /usr/local/lib/X11R6 \
-- /opt/X11R6/lib \
-- \
-- /usr/X11/lib \
-- /usr/lib/X11 \
-- /usr/local/X11/lib \
-- /usr/local/lib/X11 \
-- /opt/X11/lib \
-- \
-- /usr/X11R5/lib \
-- /usr/lib/X11R5 \
-- /usr/local/X11R5/lib \
-- /usr/local/lib/X11R5 \
-- /usr/local/x11r5/lib \
-- /opt/X11R5/lib \
-- \
-- /usr/X11R4/lib \
-- /usr/lib/X11R4 \
-- /usr/local/X11R4/lib \
-- /usr/local/lib/X11R4 \
-- \
-- /usr/X386/lib \
-- /usr/x386/lib \
-- /usr/XFree86/lib/X11 \
-- \
-- /usr/lib64 \
-- /usr/lib \
-- /usr/local/lib \
-- /usr/unsupported/lib \
-- /usr/athena/lib \
-- /usr/lpp/Xamples/lib \
-- /lib/usr/lib/X11 \
-- \
-- /usr/openwin/lib \
-- /usr/openwin/share/lib \
-- ; \
--do
-- if test -f $dir/libX11.a || \
-- test -f $dir/libX11.so || \
-- test -f $dir/libX11.dll.a || \
-- test -f $dir/libX11.dylib || \
-- test -f $dir/libX11.sa; then
-- if test $dir = /usr/lib; then
-- x11_link="-lX11"
-- else
-- x11_libs="-L$dir"
-- case "$host" in
-- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
-- *) x11_link="-L$dir -lX11";;
-- esac
-- fi
-- break
-- fi
--done
--
-+if [ -n "$x11_lib_dir" ]; then
-+ x11_link="-L$x11_lib_dir -lX11"
-+ x11_libs="-L$x11_lib_dir"
-+fi
+ nativecccompopts=''
+-nativecclinkopts=''
++nativecclinkopts=""
+ # FIXME the naming of nativecclinkopts is broken: these are options for
+ # ld (for shared libs), not for cc
+ nativeccrpath="$byteccrpath"
+@@ -766,6 +775,8 @@ case "$arch,$model,$system" in
+ aspp='gcc -m64 -c';;
+ amd64,*,*) as='as'
+ aspp='gcc -c';;
++ arm,*,freebsd*) as='cc -c';
++ aspp='cc -c';;
+ arm,*,*) as='as';
+ aspp='gcc -c';;
+ i386,*,solaris) as='as'
+@@ -803,6 +814,8 @@ case "$arch,$model,$system" in
+ amd64,*,linux) profiling='prof';;
+ amd64,*,gnu) profiling='prof';;
+ arm,*,linux*) profiling='prof';;
++ *,*,freebsd) profiling='prof';;
++ *,*,dragonfly) profiling='prof';;
+ *) profiling='noprof';;
+ esac
- if test "$x11_include" = "not found" || test "$x11_link" = "not found"
- then
- echo "X11 not found, the \"graph\" library will not be supported."
- x11_include=""
-+elif test "$x11_wanted" = "no"
-+then
-+ echo "X11 support was disabled, the \"graph\" library will not be supported."
-+ x11_include=""
-+ x11_link=""
+@@ -1204,7 +1217,7 @@ if test "$pthread_wanted" = "yes"; then
+ case "$host" in
+ *-*-solaris*) pthread_link="-lpthread -lposix4"
+ pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
+- *-*-freebsd*) pthread_link="-pthread"
++ *-*-freebsd*|*-*-dragonfly*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
+ *-*-openbsd*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
+@@ -1218,7 +1231,7 @@ if test "$pthread_wanted" = "yes"; then
+ bytecccompopts="$bytecccompopts -D_REENTRANT"
+ nativecccompopts="$nativecccompopts -D_REENTRANT"
+ case "$host" in
+- *-*-freebsd*)
++ *-*-freebsd*|*-*-dragonfly*)
+ bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
+ nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
+ *-*-openbsd*)
+@@ -1388,7 +1401,6 @@ if test "$x11_include" = "not found"; th
+ x11_libs="-L$dir"
+ case "$host" in
+ *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
+- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+ *) x11_link="-L$dir -lX11";;
+ esac
+ fi
+@@ -1514,7 +1526,7 @@ if test $has_tk = true; then
+ Tcl_DoOneEvent
+ then
+ case "$host" in
+- *-*-*bsd*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
++ *-*-*bsd*|*-*-dragonfly*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
+ *) tk_libs="-L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
+ esac
+ else
+@@ -1528,14 +1540,14 @@ if test $has_tk = true; then
+ echo "Tcl/Tk libraries found."
+ elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
+ case "$host" in
+- *-*-*bsd*) tk_libs="-R/sw/lib -L/sw/lib $tk_libs";;
++ *-*-*bsd*|*-*-dragonfly*) tk_libs="-R/sw/lib -L/sw/lib $tk_libs";;
+ *) tk_libs="-L/sw/lib $tk_libs";;
+ esac
+ echo "Tcl/Tk libraries found."
+ elif sh ./hasgot -L/usr/pkg/lib $tk_libs $tk_x11_libs $tkauxlibs \
+ Tk_SetGrid; then
+ case "$host" in
+- *-*-*bsd*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs";;
++ *-*-*bsd*|*-*-dragonfly*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs";;
+ *) tk_libs="-L/usr/pkg/lib $tk_libs";;
+ esac
+ echo "Tcl/Tk libraries found."
+@@ -1564,10 +1576,10 @@ fi
+ # Look for BFD library
+
+ if ./hasgot -i bfd.h && \
+- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
++ ./hasgot -lbfd $dllib -liberty -lz bfd_openr; then
+ echo "BFD library found."
+ echo "#define HAS_LIBBFD" >> s.h
+- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
++ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
else
- echo "Location of X11 include files: $x11_include/X11"
- echo "Options for linking with X11: $x11_link"
-@@ -1502,7 +1398,7 @@
- then tk_libs="$tk_libs $dllib"
- elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
- then
-- tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-+ tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj.$tclmin $dllib"
- elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
- then
- tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
+ echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
+ echo "LIBBFD_LINK=" >> Makefile
Property changes on: trunk/lang/ocaml/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Added: trunk/lang/ocaml/files/patch-ocamlbuild
===================================================================
--- trunk/lang/ocaml/files/patch-ocamlbuild (rev 0)
+++ trunk/lang/ocaml/files/patch-ocamlbuild 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,24 @@
+--- ocamlbuild/ocamlbuild_executor.ml.orig 2011-10-06 11:39:50.358159931 +0300
++++ ocamlbuild/ocamlbuild_executor.ml 2011-10-06 12:48:32.966029354 +0300
+@@ -200,7 +200,11 @@
+ try
+ read fd u 0 (String.length u)
+ with
+- | Unix.Unix_error(_,_,_) -> 0
++ | Unix.Unix_error(e,_,_) ->
++ let msg = error_message e in
++ display (fun oc -> fp oc
++ "Error while reading stdout/stderr: %s\n" msg);
++ 0
+ in
+ if m = 0 then
+ if job.job_dying then
+@@ -236,6 +240,8 @@
+ (*display begin fun oc -> fp oc "Terminating job %a\n%!" print_job_id job.job_id; end;*)
+
+ decr jobs_active;
++ clear_nonblock (doi job.job_stdout);
++ clear_nonblock (doi job.job_stderr); (* we would get EAGAIN below otherwise *)
+ do_read ~loop:true (doi job.job_stdout) job;
+ do_read ~loop:true (doi job.job_stderr) job;
+ outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs);
Modified: trunk/lang/ocaml/files/patch-ocamldoc_Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-ocamldoc_Makefile 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/files/patch-ocamldoc_Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -9,16 +9,3 @@
INSTALL_MLIS=odoc_info.mli
INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
-@@ -265,7 +265,11 @@
- $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
- $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
- if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
-- if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
-+ if test -d stdlib_man; then \
-+ for f in stdlib_man/*; do \
-+ $(BSD_INSTALL_MAN) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
-+ done; \
-+ fi
-
- installopt:
- if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
Property changes on: trunk/lang/ocaml/files/patch-ocamldoc_Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/lang/ocaml/files/patch-otherlibs-Makefile.shared
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-Makefile.shared (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-Makefile.shared 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,19 @@
+--- otherlibs/Makefile.shared.orig 2013-07-23 16:48:47.000000000 +0200
++++ otherlibs/Makefile.shared 2014-04-01 07:24:57.000000000 +0200
+@@ -59,14 +59,14 @@
+ install::
+ if test -f dll$(CLIBNAME)$(EXT_DLL); then \
+ cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
++ $(RANLIB) lib$(CLIBNAME).$(A)
+ cp lib$(CLIBNAME).$(A) $(LIBDIR)/
+- cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
+ cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
+ if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
+
+ installopt:
++ $(RANLIB) $(LIBNAME).a
+ cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
+- cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
+ if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
+
+ partialclean:
Added: trunk/lang/ocaml/files/patch-otherlibs-dynlink-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-dynlink-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-dynlink-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,13 @@
+--- otherlibs/dynlink/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
++++ otherlibs/dynlink/Makefile 2014-04-01 07:44:36.000000000 +0200
+@@ -71,8 +71,8 @@
+
+ installopt:
+ if $(NATDYNLINK); then \
+- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \
+- cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \
++ $(RANLIB) dynlink.$(A); \
++ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR); \
+ fi
+
+ partialclean:
Added: trunk/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,11 @@
+--- otherlibs/labltk/lib/Makefile.orig 2012-09-30 14:31:27.000000000 +0200
++++ otherlibs/labltk/lib/Makefile 2014-04-01 07:22:17.000000000 +0200
+@@ -99,7 +99,7 @@
+
+ installopt:
+ @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
++ $(RANLIB) $(LIBNAME).$(A)
+ cp $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR)
+- cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A)
+ chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
+ chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A)
Added: trunk/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,12 @@
+--- otherlibs/labltk/support/Makefile.orig 2012-07-17 17:31:12.000000000 +0200
++++ otherlibs/labltk/support/Makefile 2014-04-01 07:23:59.000000000 +0200
+@@ -43,8 +43,8 @@
+
+ install:
+ if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
++ $(RANLIB) lib$(LIBNAME).$(A)
+ cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
+- cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
+ cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
+ if test -f dll$(LIBNAME)$(EXT_DLL); then \
+ cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
Added: trunk/lang/ocaml/files/patch-otherlibs-systhreads-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-systhreads-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-systhreads-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,25 @@
+--- otherlibs/systhreads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
++++ otherlibs/systhreads/Makefile 2014-04-01 07:26:11.000000000 +0200
+@@ -71,8 +71,8 @@
+
+ install:
+ if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
++ $(RANLIB) libthreads.a
+ cp libthreads.a $(LIBDIR)/libthreads.a
+- cd $(LIBDIR); $(RANLIB) libthreads.a
+ if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
+ cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
+ rm -f $(LIBDIR)/threads/stdlib.cma
+@@ -80,10 +80,10 @@
+ cp threads.h $(LIBDIR)/caml/threads.h
+
+ installopt:
++ $(RANLIB) libthreadsnat.a
+ cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
+- cd $(LIBDIR); $(RANLIB) libthreadsnat.a
++ $(RANLIB) threads.a
+ cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads
+- cd $(LIBDIR)/threads; $(RANLIB) threads.a
+
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
+
Added: trunk/lang/ocaml/files/patch-otherlibs-threads-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-otherlibs-threads-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-otherlibs-threads-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,12 @@
+--- otherlibs/threads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
++++ otherlibs/threads/Makefile 2014-04-01 07:27:02.000000000 +0200
+@@ -98,8 +98,8 @@
+ install:
+ if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
+ mkdir -p $(LIBDIR)/vmthreads
++ $(RANLIB) libvmthreads.a
+ cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
+- cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
+ cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
+ threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
+ cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
Added: trunk/lang/ocaml/files/patch-stdlib-Makefile
===================================================================
--- trunk/lang/ocaml/files/patch-stdlib-Makefile (rev 0)
+++ trunk/lang/ocaml/files/patch-stdlib-Makefile 2014-09-15 23:46:55 UTC (rev 17312)
@@ -0,0 +1,22 @@
+--- stdlib/Makefile.orig 2012-10-15 19:50:56.000000000 +0200
++++ stdlib/Makefile 2014-04-01 07:27:40.000000000 +0200
+@@ -23,8 +23,8 @@
+ installopt: installopt-default installopt-$(PROFILING)
+
+ installopt-default:
++ $(RANLIB) stdlib.a
+ cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR)
+- cd $(LIBDIR); $(RANLIB) stdlib.a
+
+ installopt-noprof:
+ rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa
+@@ -34,8 +34,8 @@
+ rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
+
+ installopt-prof:
++ $(RANLIB) stdlib.p.a
+ cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
+- cd $(LIBDIR); $(RANLIB) stdlib.p.a
+
+ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
+ $(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)
Modified: trunk/lang/ocaml/pkg-plist
===================================================================
--- trunk/lang/ocaml/pkg-plist 2014-09-15 22:36:56 UTC (rev 17311)
+++ trunk/lang/ocaml/pkg-plist 2014-09-15 23:46:55 UTC (rev 17312)
@@ -1,4 +1,3 @@
-bin/ocamlobjinfo
bin/camlp4
bin/camlp4boot
bin/camlp4o
@@ -33,12 +32,15 @@
bin/ocamllex.opt
bin/ocamlmklib
bin/ocamlmktop
+bin/ocamlobjinfo
bin/ocamlopt
bin/ocamlopt.opt
+bin/ocamloptp
bin/ocamlprof
bin/ocamlrun
bin/ocamlyacc
lib/ocaml/Makefile.config
+lib/ocaml/VERSION
lib/ocaml/arg.cmi
lib/ocaml/arg.cmx
lib/ocaml/arg.ml
@@ -85,6 +87,7 @@
lib/ocaml/caml/config.h
lib/ocaml/caml/custom.h
lib/ocaml/caml/fail.h
+lib/ocaml/caml/hash.h
lib/ocaml/caml/intext.h
lib/ocaml/caml/memory.h
lib/ocaml/caml/misc.h
@@ -261,6 +264,149 @@
lib/ocaml/char.ml
lib/ocaml/char.mli
%%PROF%%lib/ocaml/char.p.cmx
+lib/ocaml/compiler-libs/annot.cmi
+lib/ocaml/compiler-libs/arch.cmi
+lib/ocaml/compiler-libs/asmgen.cmi
+lib/ocaml/compiler-libs/asmlibrarian.cmi
+lib/ocaml/compiler-libs/asmlink.cmi
+lib/ocaml/compiler-libs/asmpackager.cmi
+lib/ocaml/compiler-libs/ast_mapper.cmi
+lib/ocaml/compiler-libs/asttypes.cmi
+lib/ocaml/compiler-libs/btype.cmi
+lib/ocaml/compiler-libs/bytegen.cmi
+lib/ocaml/compiler-libs/bytelibrarian.cmi
+lib/ocaml/compiler-libs/bytelink.cmi
+lib/ocaml/compiler-libs/bytepackager.cmi
+lib/ocaml/compiler-libs/bytesections.cmi
+lib/ocaml/compiler-libs/ccomp.cmi
+lib/ocaml/compiler-libs/clambda.cmi
+lib/ocaml/compiler-libs/clflags.cmi
+lib/ocaml/compiler-libs/closure.cmi
+lib/ocaml/compiler-libs/cmi_format.cmi
+lib/ocaml/compiler-libs/cmm.cmi
+lib/ocaml/compiler-libs/cmmgen.cmi
+lib/ocaml/compiler-libs/cmo_format.cmi
+lib/ocaml/compiler-libs/cmt_format.cmi
+lib/ocaml/compiler-libs/cmx_format.cmi
+lib/ocaml/compiler-libs/coloring.cmi
+lib/ocaml/compiler-libs/comballoc.cmi
+lib/ocaml/compiler-libs/compenv.cmi
+lib/ocaml/compiler-libs/compile.cmi
+lib/ocaml/compiler-libs/compilenv.cmi
+lib/ocaml/compiler-libs/compmisc.cmi
+lib/ocaml/compiler-libs/config.cmi
+lib/ocaml/compiler-libs/consistbl.cmi
+lib/ocaml/compiler-libs/ctype.cmi
+lib/ocaml/compiler-libs/datarepr.cmi
+lib/ocaml/compiler-libs/debuginfo.cmi
+lib/ocaml/compiler-libs/dll.cmi
+lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/emitaux.cmi
+lib/ocaml/compiler-libs/emitcode.cmi
+lib/ocaml/compiler-libs/env.cmi
+lib/ocaml/compiler-libs/envaux.cmi
+lib/ocaml/compiler-libs/errors.cmi
+lib/ocaml/compiler-libs/expunge.cmi
+lib/ocaml/compiler-libs/genprintval.cmi
+lib/ocaml/compiler-libs/ident.cmi
+lib/ocaml/compiler-libs/includeclass.cmi
+lib/ocaml/compiler-libs/includecore.cmi
+lib/ocaml/compiler-libs/includemod.cmi
+lib/ocaml/compiler-libs/instruct.cmi
+lib/ocaml/compiler-libs/interf.cmi
+lib/ocaml/compiler-libs/lambda.cmi
+lib/ocaml/compiler-libs/lexer.cmi
+lib/ocaml/compiler-libs/linearize.cmi
+lib/ocaml/compiler-libs/liveness.cmi
+lib/ocaml/compiler-libs/location.cmi
+lib/ocaml/compiler-libs/longident.cmi
+lib/ocaml/compiler-libs/mach.cmi
+lib/ocaml/compiler-libs/main.cmi
+lib/ocaml/compiler-libs/main.cmo
+lib/ocaml/compiler-libs/main.cmx
+lib/ocaml/compiler-libs/main.o
+lib/ocaml/compiler-libs/main_args.cmi
+lib/ocaml/compiler-libs/matching.cmi
+lib/ocaml/compiler-libs/meta.cmi
+lib/ocaml/compiler-libs/misc.cmi
+lib/ocaml/compiler-libs/mtype.cmi
+lib/ocaml/compiler-libs/ocamlbytecomp.a
+lib/ocaml/compiler-libs/ocamlbytecomp.cma
+lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+lib/ocaml/compiler-libs/ocamlcommon.a
+lib/ocaml/compiler-libs/ocamlcommon.cma
+lib/ocaml/compiler-libs/ocamlcommon.cmxa
+lib/ocaml/compiler-libs/ocamloptcomp.a
+lib/ocaml/compiler-libs/ocamloptcomp.cma
+lib/ocaml/compiler-libs/ocamloptcomp.cmxa
+lib/ocaml/compiler-libs/ocamltoplevel.cma
+lib/ocaml/compiler-libs/opcodes.cmi
+lib/ocaml/compiler-libs/oprint.cmi
+lib/ocaml/compiler-libs/optcompile.cmi
+lib/ocaml/compiler-libs/opterrors.cmi
+lib/ocaml/compiler-libs/optmain.cmi
+lib/ocaml/compiler-libs/optmain.cmo
+lib/ocaml/compiler-libs/optmain.cmx
+lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/outcometree.cmi
+lib/ocaml/compiler-libs/parmatch.cmi
+lib/ocaml/compiler-libs/parse.cmi
+lib/ocaml/compiler-libs/parser.cmi
+lib/ocaml/compiler-libs/parsetree.cmi
+lib/ocaml/compiler-libs/path.cmi
+lib/ocaml/compiler-libs/pparse.cmi
+lib/ocaml/compiler-libs/pprintast.cmi
+lib/ocaml/compiler-libs/predef.cmi
+lib/ocaml/compiler-libs/primitive.cmi
+lib/ocaml/compiler-libs/printast.cmi
+lib/ocaml/compiler-libs/printclambda.cmi
+lib/ocaml/compiler-libs/printcmm.cmi
+lib/ocaml/compiler-libs/printinstr.cmi
+lib/ocaml/compiler-libs/printlambda.cmi
+lib/ocaml/compiler-libs/printlinear.cmi
+lib/ocaml/compiler-libs/printmach.cmi
+lib/ocaml/compiler-libs/printtyp.cmi
+lib/ocaml/compiler-libs/printtyped.cmi
+lib/ocaml/compiler-libs/proc.cmi
+lib/ocaml/compiler-libs/reg.cmi
+lib/ocaml/compiler-libs/reload.cmi
+lib/ocaml/compiler-libs/reloadgen.cmi
+lib/ocaml/compiler-libs/runtimedef.cmi
+lib/ocaml/compiler-libs/schedgen.cmi
+lib/ocaml/compiler-libs/scheduling.cmi
+lib/ocaml/compiler-libs/selectgen.cmi
+lib/ocaml/compiler-libs/selection.cmi
+lib/ocaml/compiler-libs/simplif.cmi
+lib/ocaml/compiler-libs/spill.cmi
+lib/ocaml/compiler-libs/split.cmi
+lib/ocaml/compiler-libs/stypes.cmi
+lib/ocaml/compiler-libs/subst.cmi
+lib/ocaml/compiler-libs/switch.cmi
+lib/ocaml/compiler-libs/symtable.cmi
+lib/ocaml/compiler-libs/syntaxerr.cmi
+lib/ocaml/compiler-libs/tbl.cmi
+lib/ocaml/compiler-libs/terminfo.cmi
+lib/ocaml/compiler-libs/topdirs.cmi
+lib/ocaml/compiler-libs/toploop.cmi
+lib/ocaml/compiler-libs/topmain.cmi
+lib/ocaml/compiler-libs/topstart.cmi
+lib/ocaml/compiler-libs/topstart.cmo
+lib/ocaml/compiler-libs/trace.cmi
+lib/ocaml/compiler-libs/translclass.cmi
+lib/ocaml/compiler-libs/translcore.cmi
+lib/ocaml/compiler-libs/translmod.cmi
+lib/ocaml/compiler-libs/translobj.cmi
+lib/ocaml/compiler-libs/typeclass.cmi
+lib/ocaml/compiler-libs/typecore.cmi
+lib/ocaml/compiler-libs/typedecl.cmi
+lib/ocaml/compiler-libs/typedtree.cmi
+lib/ocaml/compiler-libs/typedtreeIter.cmi
+lib/ocaml/compiler-libs/typedtreeMap.cmi
+lib/ocaml/compiler-libs/typemod.cmi
+lib/ocaml/compiler-libs/typeopt.cmi
+lib/ocaml/compiler-libs/types.cmi
+lib/ocaml/compiler-libs/typetexp.cmi
+lib/ocaml/compiler-libs/warnings.cmi
lib/ocaml/complex.cmi
lib/ocaml/complex.cmx
lib/ocaml/complex.ml
@@ -267,13 +413,6 @@
lib/ocaml/complex.mli
%%PROF%%lib/ocaml/complex.p.cmx
%%THREADS%%lib/ocaml/condition.mli
-lib/ocaml/dbm.a
-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
@@ -280,10 +419,10 @@
lib/ocaml/digest.mli
%%PROF%%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.cma
-lib/ocaml/dynlink.cmi
lib/ocaml/dynlink.mli
%%THREADS%%lib/ocaml/event.mli
lib/ocaml/expunge
@@ -632,9 +771,9 @@
%%TK%%lib/ocaml/labltk/tkcompiler
%%TK%%lib/ocaml/labltk/tkthread.cmi
%%TK%%lib/ocaml/labltk/tkthread.cmo
-%%THREADS%%%%TK%%lib/ocaml/labltk/tkthread.cmx
+%%TK%%lib/ocaml/labltk/tkthread.cmx
%%TK%%lib/ocaml/labltk/tkthread.mli
-%%THREADS%%%%TK%%lib/ocaml/labltk/tkthread.o
+%%TK%%lib/ocaml/labltk/tkthread.o
%%TK%%lib/ocaml/labltk/tkvars.cmi
%%TK%%lib/ocaml/labltk/tkvars.cmx
%%TK%%lib/ocaml/labltk/tkvars.mli
@@ -671,7 +810,6 @@
lib/ocaml/libcamlrun_shared.so
lib/ocaml/libcamlstr.a
%%X11%%lib/ocaml/libgraphics.a
-lib/ocaml/libmldbm.a
lib/ocaml/libnums.a
%%THREADS%%lib/ocaml/libthreads.a
%%THREADS%%lib/ocaml/libthreadsnat.a
@@ -721,8 +859,8 @@
lib/ocaml/obj.cmx
lib/ocaml/obj.ml
lib/ocaml/obj.mli
+%%PROF%%lib/ocaml/obj.p.cmx
lib/ocaml/objinfo_helper
-%%PROF%%lib/ocaml/obj.p.cmx
lib/ocaml/ocamlbuild/ocamlbuild.cmo
lib/ocaml/ocamlbuild/ocamlbuild.cmx
lib/ocaml/ocamlbuild/ocamlbuild.o
@@ -732,6 +870,8 @@
lib/ocaml/ocamlbuild/ocamlbuild_executor.o
lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmo
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
@@ -739,7 +879,6 @@
lib/ocaml/ocamlbuild/ocamlbuildlib.a
lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
-lib/ocaml/ocamldoc/custom/.keep
lib/ocaml/ocamldoc/ocamldoc.hva
lib/ocaml/ocamldoc/odoc.cmi
lib/ocaml/ocamldoc/odoc_analyse.cmi
@@ -756,6 +895,7 @@
lib/ocaml/ocamldoc/odoc_dot.cmi
lib/ocaml/ocamldoc/odoc_env.cmi
lib/ocaml/ocamldoc/odoc_exception.cmi
+lib/ocaml/ocamldoc/odoc_gen.cmi
lib/ocaml/ocamldoc/odoc_global.cmi
lib/ocaml/ocamldoc/odoc_html.cmi
lib/ocaml/ocamldoc/odoc_info.a
@@ -796,8 +936,6 @@
lib/ocaml/oo.ml
lib/ocaml/oo.mli
%%PROF%%lib/ocaml/oo.p.cmx
-lib/ocaml/outcometree.cmi
-lib/ocaml/outcometree.mli
lib/ocaml/parsing.cmi
lib/ocaml/parsing.cmx
lib/ocaml/parsing.ml
@@ -820,6 +958,8 @@
%%PROF%%lib/ocaml/printf.p.cmx
lib/ocaml/profiling.cmi
lib/ocaml/profiling.cmo
+lib/ocaml/profiling.cmx
+lib/ocaml/profiling.o
lib/ocaml/queue.cmi
lib/ocaml/queue.cmx
lib/ocaml/queue.ml
@@ -863,7 +1003,7 @@
lib/ocaml/std_exit.cmx
lib/ocaml/std_exit.ml
lib/ocaml/std_exit.o
-lib/ocaml/std_exit.p.cmx
+%%PROF%%lib/ocaml/std_exit.p.cmx
lib/ocaml/std_exit.p.o
lib/ocaml/stdlib.a
lib/ocaml/stdlib.cma
@@ -893,10 +1033,9 @@
lib/ocaml/stringLabels.mli
%%PROF%%lib/ocaml/stringLabels.p.cmx
lib/ocaml/stublibs/dllbigarray.so
+lib/ocaml/stublibs/dllcamlstr.so
%%X11%%lib/ocaml/stublibs/dllgraphics.so
%%TK%%lib/ocaml/stublibs/dlllabltk.so
-lib/ocaml/stublibs/dllcamlstr.so
-lib/ocaml/stublibs/dllmldbm.so
lib/ocaml/stublibs/dllnums.so
%%THREADS%%lib/ocaml/stublibs/dllthreads.so
lib/ocaml/stublibs/dllunix.so
@@ -922,10 +1061,6 @@
%%THREADS%%lib/ocaml/threads/threads.cma
%%THREADS%%lib/ocaml/threads/threads.cmxa
lib/ocaml/topdirs.cmi
-lib/ocaml/toplevellib.cma
-lib/ocaml/toploop.cmi
-lib/ocaml/topmain.cmi
-lib/ocaml/topstart.cmo
lib/ocaml/unix.a
lib/ocaml/unix.cma
lib/ocaml/unix.cmi
@@ -955,51 +1090,117 @@
lib/ocaml/weak.ml
lib/ocaml/weak.mli
%%PROF%%lib/ocaml/weak.p.cmx
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/eyes.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileinput.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileopen.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/helloworld.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/CamlBook.gif
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/Lambda2.back.gif
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/dojoji.back.gif
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/jptest.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/mytext.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/socketinput.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/taddition.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml
-%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/README
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/calc.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/clock.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/demo.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/eyes.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.tcl
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/lang.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/taquin.ml
-%%TK%%%%EXAMPLESDIR%%/examples_labltk/tetris.ml
-%%TK%%@dirrm %%EXAMPLESDIR%%/examples_labltk
-%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk/images
-%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk
- at dirrmtry %%EXAMPLESDIR%%
- at dirrm lib/ocaml/vmthreads
-%%THREADS%%@dirrm lib/ocaml/threads
+man/man1/ocaml.1.gz
+man/man1/ocamlbuild.1.gz
+man/man1/ocamlc.1.gz
+man/man1/ocamlc.opt.1.gz
+man/man1/ocamlcp.1.gz
+man/man1/ocamldebug.1.gz
+man/man1/ocamldep.1.gz
+man/man1/ocamldoc.1.gz
+man/man1/ocamllex.1.gz
+man/man1/ocamlmktop.1.gz
+man/man1/ocamlopt.1.gz
+man/man1/ocamlopt.opt.1.gz
+man/man1/ocamloptp.1.gz
+man/man1/ocamlprof.1.gz
+man/man1/ocamlrun.1.gz
+man/man1/ocamlyacc.1.gz
+man/mann/Arg.3o.gz
+man/mann/Array.3o.gz
+man/mann/ArrayLabels.3o.gz
+man/mann/Bigarray.3o.gz
+man/mann/Bigarray.Array1.3o.gz
+man/mann/Bigarray.Array2.3o.gz
+man/mann/Bigarray.Array3.3o.gz
+man/mann/Bigarray.Genarray.3o.gz
+man/mann/Buffer.3o.gz
+man/mann/Callback.3o.gz
+man/mann/CamlinternalLazy.3o.gz
+man/mann/CamlinternalMod.3o.gz
+man/mann/CamlinternalOO.3o.gz
+man/mann/Complex.3o.gz
+man/mann/Digest.3o.gz
+man/mann/Filename.3o.gz
+man/mann/Format.3o.gz
+man/mann/Gc.3o.gz
+man/mann/Genlex.3o.gz
+man/mann/Hashtbl.3o.gz
+man/mann/Hashtbl.HashedType.3o.gz
+man/mann/Hashtbl.Make.3o.gz
+man/mann/Hashtbl.MakeSeeded.3o.gz
+man/mann/Hashtbl.S.3o.gz
+man/mann/Hashtbl.SeededHashedType.3o.gz
+man/mann/Hashtbl.SeededS.3o.gz
+man/mann/Int32.3o.gz
+man/mann/Int64.3o.gz
+man/mann/Lexing.3o.gz
+man/mann/List.3o.gz
+man/mann/ListLabels.3o.gz
+man/mann/Map.3o.gz
+man/mann/Map.Make.3o.gz
+man/mann/Map.OrderedType.3o.gz
+man/mann/Map.S.3o.gz
+man/mann/Marshal.3o.gz
+man/mann/MoreLabels.3o.gz
+man/mann/MoreLabels.Hashtbl.3o.gz
+man/mann/MoreLabels.Hashtbl.HashedType.3o.gz
+man/mann/MoreLabels.Hashtbl.Make.3o.gz
+man/mann/MoreLabels.Hashtbl.MakeSeeded.3o.gz
+man/mann/MoreLabels.Hashtbl.S.3o.gz
+man/mann/MoreLabels.Hashtbl.SeededHashedType.3o.gz
+man/mann/MoreLabels.Hashtbl.SeededS.3o.gz
+man/mann/MoreLabels.Map.3o.gz
+man/mann/MoreLabels.Map.Make.3o.gz
+man/mann/MoreLabels.Map.OrderedType.3o.gz
+man/mann/MoreLabels.Map.S.3o.gz
+man/mann/MoreLabels.Set.3o.gz
+man/mann/MoreLabels.Set.Make.3o.gz
+man/mann/MoreLabels.Set.OrderedType.3o.gz
+man/mann/MoreLabels.Set.S.3o.gz
+man/mann/Nativeint.3o.gz
+man/mann/Num.3o.gz
+man/mann/Obj.3o.gz
+man/mann/Oo.3o.gz
+man/mann/Parsing.3o.gz
+man/mann/Pervasives.3o.gz
+man/mann/Pervasives.LargeFile.3o.gz
+man/mann/Printexc.3o.gz
+man/mann/Printf.3o.gz
+man/mann/Queue.3o.gz
+man/mann/Random.3o.gz
+man/mann/Random.State.3o.gz
+man/mann/Scanf.3o.gz
+man/mann/Scanf.Scanning.3o.gz
+man/mann/Set.Make.3o.gz
+man/mann/Set.OrderedType.3o.gz
+man/mann/Set.S.3o.gz
+man/mann/Sort.3o.gz
+man/mann/Stack.3o.gz
+man/mann/StdLabels.3o.gz
+man/mann/StdLabels.Array.3o.gz
+man/mann/StdLabels.List.3o.gz
+man/mann/StdLabels.String.3o.gz
+man/mann/Str.3o.gz
+man/mann/Stream.3o.gz
+man/mann/StringLabels.3o.gz
+man/mann/Sys.3o.gz
+man/mann/Unix.3o.gz
+man/mann/Unix.LargeFile.3o.gz
+man/mann/Weak.3o.gz
+man/mann/Weak.Make.3o.gz
+man/mann/Weak.S.3o.gz
+ at dirrmtry lib/ocaml/vmthreads
+ at dirrmtry lib/ocaml/threads
@dirrmtry lib/ocaml/stublibs
- at dirrm lib/ocaml/ocamldoc/custom
- at dirrm lib/ocaml/ocamldoc
- at dirrm lib/ocaml/ocamlbuild
+ at dirrmtry lib/ocaml/ocamldoc
+ at dirrmtry lib/ocaml/ocamlbuild
%%TK%%@dirrmtry lib/ocaml/labltk
- at dirrm lib/ocaml/camlp4/Camlp4Top
- at dirrm lib/ocaml/camlp4/Camlp4Printers
- at dirrm lib/ocaml/camlp4/Camlp4Parsers
- at dirrm lib/ocaml/camlp4/Camlp4Filters
- at dirrm lib/ocaml/camlp4
- at dirrm lib/ocaml/caml
- at comment lib/ocaml will be added by Makefile
+ at dirrmtry lib/ocaml/compiler-libs
+ at dirrmtry lib/ocaml/camlp4/Camlp4Top
+ at dirrmtry lib/ocaml/camlp4/Camlp4Printers
+ at dirrmtry lib/ocaml/camlp4/Camlp4Parsers
+ at dirrmtry lib/ocaml/camlp4/Camlp4Filters
+ at dirrmtry lib/ocaml/camlp4
+ at dirrmtry lib/ocaml/caml
+ at dirrmtry lib/ocaml
More information about the Midnightbsd-cvs
mailing list