Attachment #155690 for bug #195736





# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
PORTNAME=	ocaml
PORTVERSION=	4.02.1
PORTREVISION=	4
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
		${MASTER_SITE_GENTOO}

LICENSE_FILE_QPL10=	${WRKSRC}/LICENSE
LICENSE_PERMS_QPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		gmake tar:xz
REINPLACE_ARGS=	-i ""
HAS_CONFIGURE=	yes
ALL_TARGET=	world.opt

		-aspp "${CC} -c" \
		-partialld "${LD} -r"

OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES
OPTIONS_DEFAULT=X11 THREADS
TK_DESC=	LablTk library (requires X11 support)
CMP_LIB_DESC=	Install compiler libraries
PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
		${DOCSDISTNAME}-refman.pdf

CONFIGURE_ARGS+=-no-graph
.endif

.if ${PORT_OPTIONS:MTK}
. if ${PORT_OPTIONS:MEXAMPLES}
PORTEXAMPLES=	examples_camltk examples_labltk
.endif
. if ! ${PORT_OPTIONS:MX11}
IGNORE=requires X11 support to build TK bindings
. endif
USES+=		tk:84+
PLIST_SUB+=	TK=""
CONFIGURE_ARGS+=	-tkdefs \
			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \
			-ltcl${TCL_VER:S|.||} ${THR_LD}"
.else
PLIST_SUB+=	TK="@comment "
CONFIGURE_ARGS+=-no-tk
.endif

.include <bsd.port.pre.mk>
.include "${FILESDIR}/manfiles"

OCAML_ARCH= ${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}

.if defined(NO_PROFILE) || ${OCAML_ARCH} == power || ${OCAML_ARCH} == amd64
PLIST_SUB+=	PROF="@comment "
.else
PLIST_SUB+=	PROF=""

		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
		${WRKSRC}/configure
# don't hardcode gcc for depend target
# be aware of staging
	@${REINPLACE_CMD} -E \
		-e 's|gcc|$$(CC)|' \
		-e '/^install/,/^$$/s@\$$\(((INSTALL_)?(BIN|LIB|STUBLIB|COMPLIB|MANO?|INSTALL|INSTALL_CUSTOM)DIR)\)@$$(STAGEDIR)$$(\1)@g' \
		`find ${WRKSRC} -name 'Makefile*'`
	@${REINPLACE_CMD} -E -e 's/^DIR=/DIR=$$(STAGEDIR)/' ${WRKSRC}/man/Makefile
.if ${PORT_OPTIONS:MTK}
	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|' \
		${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
.endif

post-configure:
# CFLAGS safeness

	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report

post-install:
	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/ocamldoc/custom
	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/ocaml/expunge
.if ${PORT_OPTIONS:MTK}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	(cd ${WRKSRC}/otherlibs/labltk && \
		${COPYTREE_SHARE} examples_labltk ${STAGEDIR}${EXAMPLESDIR} \
		"! -name .ignore" && \
		${COPYTREE_SHARE} examples_camltk ${STAGEDIR}${EXAMPLESDIR} \
		"! -name .ignore")
.endif
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})

Lines 1-8 Link Here

(-)b/lang/ocaml/distinfo (-8 / +8 lines)
1	SHA256 (ocaml-4.01.0.tar.bz2) = b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a	1	SHA256 (ocaml-4.02.1.tar.xz) = 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc
2	SIZE (ocaml-4.01.0.tar.bz2) = 3691090	2	SIZE (ocaml-4.02.1.tar.xz) = 2031244
3	SHA256 (ocaml-4.01-refman-html.tar.gz) = 01019c8f8a29a8a7f422e090704b666ade2a007d57ea9412285f88f716656001	3	SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8
4	SIZE (ocaml-4.01-refman-html.tar.gz) = 571422	4	SIZE (ocaml-4.02-refman-html.tar.gz) = 612839
5	SHA256 (ocaml-4.01-refman.ps.gz) = 4de67ef967b8b39a6f030df258087239d6f7dee869a3973d7a782b7986b809c6	5	SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a
6	SIZE (ocaml-4.01-refman.ps.gz) = 1089703	6	SIZE (ocaml-4.02-refman.ps.gz) = 1111960
7	SHA256 (ocaml-4.01-refman.pdf) = 389e434f534153530ba234299d0f3a0e4271d18b091b9216e4a37335ebd33424	7	SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8
8	SIZE (ocaml-4.01-refman.pdf) = 1478900	8	SIZE (ocaml-4.02-refman.pdf) = 1519190

Removed Link Here

(-)a/lang/ocaml/files/edit_pkg-plist.sed (-9 lines)
1	/\.p\.cmx$/s@^@%%PROF%%@
2	/examples_labeltk/{
3	s@share/examples@%%EXAMPLESDIR%%@
4	s@^@%%TK%%@
5	}
6	/graphics/s@^@%%X11%%@
7	/labltk/s@^@%%TK%%@
8	/ocamlbrowser/s@^@%%TK%%@
9	/dlllabltk.so/s@^@%%TK%%@




--- 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
 

Removed Link Here

(-)a/lang/ocaml/files/patch-asmcomp__arm__arch.ml (-11 lines)
1	--- ./asmcomp/arm/arch.ml.orig 2014-04-28 13:12:11.000000000 +0100
2	+++ ./asmcomp/arm/arch.ml 2014-04-28 13:12:36.000000000 +0100
3	@@ -21,7 +21,7 @@
4
5	let abi =
6	match Config.system with
7	- "linux_eabi" -> EABI
8	+ "linux_eabi" \| "freebsd" -> EABI
9	\| "linux_eabihf" -> EABI_HF
10	\| _ -> assert false
11




--- 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




--- ./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

Removed Link Here

(-)a/lang/ocaml/files/patch-byterun-Makefile.common (-10 lines)
1	--- byterun/Makefile.common.orig 2014-04-01 07:13:45.000000000 +0200
2	+++ byterun/Makefile.common 2014-04-01 07:13:58.000000000 +0200
3	@@ -51,7 +51,6 @@
4	install::
5	cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
6	cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A)
7	- cd $(LIBDIR); $(RANLIB) libcamlrun.$(A)
8	if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
9	for i in $(PUBLIC_INCLUDES); do \
10	sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \




--- 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
-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
 
 include ../config/Makefile.base
 
@@ -22,10 +21,6 @@
 	if test -n '$(MANDIR)'; then \
 	  $(MKDIR) $(MANDIR)/man1 ; \
 	  cp $(TARGET) $(MANDIR)/man1/. ; \
-	  for i in $(ALIASES); do \
-	    rm -f $(MANDIR)/man1/$$i; \
-	    echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
-	  done; \
 	fi
 
 camlp4.1: camlp4.1.tpl

Removed Link Here

(-)a/lang/ocaml/files/patch-config-auto-aux-async_io.c (-10 lines)
1	--- config/auto-aux/async_io.c 2012-11-01 17:36:02.000000000 +0100
2	+++ config/auto-aux/async_io.c.orig 2012-11-01 17:35:46.000000000 +0100
3	@@ -13,7 +13,8 @@
4
5	/* $Id: async_io.c 11156 2011-07-27 14:17:02Z doligez $ */
6
7	+#include <stdlib.h>
8	#include <stdio.h>
9	#include <fcntl.h>
10	#include <signal.h>




--- configure.orig	2014-12-06 11:33:20.000000000 +0000
+++ configure	2014-12-06 11:33:37.000000000 +0000
@@ -1560,6 +1560,7 @@
       else
       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;;
     arm*-*-linux*)                natdynlink=true;;
+    arm*-*-freebsd*)              natdynlink=true;;
+    powerpc*-*-freebsd*)          natdynlink=true;;
   esac
 fi
 
@@ -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-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
@@ -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
 
 # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
@@ -734,7 +743,7 @@ else
 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
 
@@ -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 "$target" in
+          *-*-freebsd*) x11_link="-L$dir -lX11";;
           *-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 "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
   echo "LIBBFD_LINK=" >> Makefile




--- 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);

Removed Link Here

(-)a/lang/ocaml/files/patch-ocamldoc_Makefile (-11 lines)
1	--- ocamldoc/Makefile.orig 2007-12-21 00:32:44.000000000 +0300
2	+++ ocamldoc/Makefile 2007-12-21 00:33:26.000000000 +0300
3	@@ -40,7 +40,7 @@
4	INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
5	INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
6	INSTALL_BINDIR=$(OCAMLBIN)
7	-INSTALL_MANODIR=$(MANDIR)/man3
8	+INSTALL_MANODIR=$(MANDIR)/mann
9
10	INSTALL_MLIS=odoc_info.mli
11	INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)




--- 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:




--- 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:

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile (-11 lines)
1	--- otherlibs/labltk/lib/Makefile.orig 2012-09-30 14:31:27.000000000 +0200
2	+++ otherlibs/labltk/lib/Makefile 2014-04-01 07:22:17.000000000 +0200
3	@@ -99,7 +99,7 @@
4
5	installopt:
6	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
7	+ $(RANLIB) $(LIBNAME).$(A)
8	cp $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR)
9	- cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A)
10	chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
11	chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A)




--- 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




--- 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
 




--- 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 \




--- 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)




bin/camlp4
bin/camlp4boot
bin/camlp4o
bin/camlp4o.opt
bin/camlp4of
bin/camlp4of.opt
bin/camlp4oof
bin/camlp4oof.opt
bin/camlp4orf
bin/camlp4orf.opt
bin/camlp4prof
bin/camlp4r
bin/camlp4r.opt
bin/camlp4rf
bin/camlp4rf.opt
%%TK%%bin/labltk
bin/mkcamlp4
bin/ocaml
%%TK%%bin/ocamlbrowser
bin/ocamlbuild
bin/ocamlbuild.byte
bin/ocamlbuild.native

lib/ocaml/VERSION
lib/ocaml/arg.cmi
lib/ocaml/arg.cmx
%%PROF%%lib/ocaml/arg.p.cmx
lib/ocaml/arg.ml
lib/ocaml/arg.mli
%%PROF%%lib/ocaml/arg.p.cmx
lib/ocaml/arith_flags.cmx
lib/ocaml/arith_status.cmi
lib/ocaml/arith_status.cmx
lib/ocaml/arith_status.mli
lib/ocaml/array.cmi
lib/ocaml/array.cmx
%%PROF%%lib/ocaml/array.p.cmx
lib/ocaml/array.ml
lib/ocaml/array.mli
%%PROF%%lib/ocaml/array.p.cmx
lib/ocaml/arrayLabels.cmi
lib/ocaml/arrayLabels.cmx
%%PROF%%lib/ocaml/arrayLabels.p.cmx
lib/ocaml/arrayLabels.ml
lib/ocaml/arrayLabels.mli
%%PROF%%lib/ocaml/arrayLabels.p.cmx
lib/ocaml/big_int.cmi
lib/ocaml/big_int.cmx
lib/ocaml/big_int.mli

lib/ocaml/bigarray.mli
lib/ocaml/buffer.cmi
lib/ocaml/buffer.cmx
%%PROF%%lib/ocaml/buffer.p.cmx
lib/ocaml/buffer.ml
lib/ocaml/buffer.mli
lib/ocaml/bytes.cmi
lib/ocaml/bytes.cmx
%%PROF%%lib/ocaml/bytes.p.cmx
lib/ocaml/bytes.ml
lib/ocaml/bytes.mli
lib/ocaml/bytesLabels.cmi
lib/ocaml/bytesLabels.cmx
%%PROF%%lib/ocaml/bytesLabels.p.cmx
lib/ocaml/bytesLabels.ml
lib/ocaml/bytesLabels.mli
lib/ocaml/callback.cmi
lib/ocaml/callback.cmx
%%PROF%%lib/ocaml/callback.p.cmx
lib/ocaml/callback.ml
lib/ocaml/callback.mli
%%PROF%%lib/ocaml/callback.p.cmx
lib/ocaml/caml/alloc.h
lib/ocaml/caml/bigarray.h
lib/ocaml/caml/callback.h

lib/ocaml/caml/socketaddr.h
%%THREADS%%lib/ocaml/caml/threads.h
lib/ocaml/caml/unixsupport.h
lib/ocaml/caml/version.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
lib/ocaml/camlinternalFormat.cmi
lib/ocaml/camlinternalFormat.cmx
%%PROF%%lib/ocaml/camlinternalFormat.p.cmx
lib/ocaml/camlinternalFormat.ml
lib/ocaml/camlinternalFormat.mli
lib/ocaml/camlinternalFormatBasics.cmi
lib/ocaml/camlinternalFormatBasics.cmx
%%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmx
lib/ocaml/camlinternalFormatBasics.ml
lib/ocaml/camlinternalFormatBasics.mli
lib/ocaml/camlinternalLazy.cmi
lib/ocaml/camlinternalLazy.cmx
%%PROF%%lib/ocaml/camlinternalLazy.p.cmx
lib/ocaml/camlinternalLazy.ml
lib/ocaml/camlinternalLazy.mli
%%PROF%%lib/ocaml/camlinternalLazy.p.cmx
lib/ocaml/camlinternalMod.cmi
lib/ocaml/camlinternalMod.cmx
%%PROF%%lib/ocaml/camlinternalMod.p.cmx
lib/ocaml/camlinternalMod.ml
lib/ocaml/camlinternalMod.mli
%%PROF%%lib/ocaml/camlinternalMod.p.cmx
lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.cmx
%%PROF%%lib/ocaml/camlinternalOO.p.cmx
lib/ocaml/camlinternalOO.ml
lib/ocaml/camlinternalOO.mli
%%PROF%%lib/ocaml/camlinternalOO.p.cmx
lib/ocaml/camlp4/Camlp4.cmi
lib/ocaml/camlp4/Camlp4Bin.cmi
lib/ocaml/camlp4/Camlp4Bin.cmo
lib/ocaml/camlp4/Camlp4Bin.cmx
lib/ocaml/camlp4/Camlp4Bin.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx
lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx
lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o
lib/ocaml/camlp4/Camlp4Top.cmi
lib/ocaml/camlp4/Camlp4Top.cmo
lib/ocaml/camlp4/Camlp4Top/Rprint.cmi
lib/ocaml/camlp4/Camlp4Top/Rprint.cmo
lib/ocaml/camlp4/Camlp4Top/Rprint.cmx
lib/ocaml/camlp4/Camlp4Top/Rprint.o
lib/ocaml/camlp4/Camlp4Top/Top.cmi
lib/ocaml/camlp4/Camlp4Top/Top.cmo
lib/ocaml/camlp4/Camlp4Top/Top.cmx
lib/ocaml/camlp4/Camlp4Top/Top.o
lib/ocaml/camlp4/Camlp4_config.cmi
lib/ocaml/camlp4/Camlp4_import.cmi
lib/ocaml/camlp4/camlp4fulllib.a
lib/ocaml/camlp4/camlp4fulllib.cma
lib/ocaml/camlp4/camlp4fulllib.cmxa
lib/ocaml/camlp4/camlp4lib.a
lib/ocaml/camlp4/camlp4lib.cma
lib/ocaml/camlp4/camlp4lib.cmxa
lib/ocaml/camlp4/camlp4o.cma
lib/ocaml/camlp4/camlp4of.cma
lib/ocaml/camlp4/camlp4oof.cma
lib/ocaml/camlp4/camlp4orf.cma
lib/ocaml/camlp4/camlp4prof.cmi
lib/ocaml/camlp4/camlp4prof.cmo
lib/ocaml/camlp4/camlp4prof.cmx
lib/ocaml/camlp4/camlp4prof.o
lib/ocaml/camlp4/camlp4r.cma
lib/ocaml/camlp4/camlp4rf.cma
lib/ocaml/char.cmi
lib/ocaml/char.cmx
%%PROF%%lib/ocaml/char.p.cmx
lib/ocaml/char.ml
lib/ocaml/char.mli
lib/ocaml/compiler-libs/CSE.cmi
lib/ocaml/compiler-libs/CSEgen.cmi
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_helper.cmi
lib/ocaml/compiler-libs/ast_mapper.cmi
lib/ocaml/compiler-libs/asttypes.cmi
lib/ocaml/compiler-libs/btype.cmi

lib/ocaml/compiler-libs/consistbl.cmi
lib/ocaml/compiler-libs/ctype.cmi
lib/ocaml/compiler-libs/datarepr.cmi
lib/ocaml/compiler-libs/deadcode.cmi
lib/ocaml/compiler-libs/debuginfo.cmi
lib/ocaml/compiler-libs/dll.cmi
lib/ocaml/compiler-libs/emit.cmi

lib/ocaml/compiler-libs/simplif.cmi
lib/ocaml/compiler-libs/spill.cmi
lib/ocaml/compiler-libs/split.cmi
lib/ocaml/compiler-libs/strmatch.cmi
lib/ocaml/compiler-libs/stypes.cmi
lib/ocaml/compiler-libs/subst.cmi
lib/ocaml/compiler-libs/switch.cmi

lib/ocaml/compiler-libs/warnings.cmi
lib/ocaml/complex.cmi
lib/ocaml/complex.cmx
%%PROF%%lib/ocaml/complex.p.cmx
lib/ocaml/complex.ml
lib/ocaml/complex.mli
%%PROF%%lib/ocaml/complex.p.cmx
%%THREADS%%lib/ocaml/condition.mli
lib/ocaml/digest.cmi
lib/ocaml/digest.cmx
%%PROF%%lib/ocaml/digest.p.cmx
lib/ocaml/digest.ml
lib/ocaml/digest.mli
%%PROF%%lib/ocaml/digest.p.cmx
lib/ocaml/dynlink.a
lib/ocaml/dynlink.cma
lib/ocaml/dynlink.cmi

lib/ocaml/extract_crc
lib/ocaml/filename.cmi
lib/ocaml/filename.cmx
%%PROF%%lib/ocaml/filename.p.cmx
lib/ocaml/filename.ml
lib/ocaml/filename.mli
%%PROF%%lib/ocaml/filename.p.cmx
lib/ocaml/format.cmi
lib/ocaml/format.cmx
%%PROF%%lib/ocaml/format.p.cmx
lib/ocaml/format.ml
lib/ocaml/format.mli
%%PROF%%lib/ocaml/format.p.cmx
lib/ocaml/gc.cmi
lib/ocaml/gc.cmx
%%PROF%%lib/ocaml/gc.p.cmx
lib/ocaml/gc.ml
lib/ocaml/gc.mli
%%PROF%%lib/ocaml/gc.p.cmx
lib/ocaml/genlex.cmi
lib/ocaml/genlex.cmx
%%PROF%%lib/ocaml/genlex.p.cmx
lib/ocaml/genlex.ml
lib/ocaml/genlex.mli
%%PROF%%lib/ocaml/genlex.p.cmx
%%X11%%lib/ocaml/graphics.a
%%X11%%lib/ocaml/graphics.cma
%%X11%%lib/ocaml/graphics.cmi

%%X11%%lib/ocaml/graphicsX11.mli
lib/ocaml/hashtbl.cmi
lib/ocaml/hashtbl.cmx
%%PROF%%lib/ocaml/hashtbl.p.cmx
lib/ocaml/hashtbl.ml
lib/ocaml/hashtbl.mli
%%PROF%%lib/ocaml/hashtbl.p.cmx
lib/ocaml/int32.cmi
lib/ocaml/int32.cmx
%%PROF%%lib/ocaml/int32.p.cmx
lib/ocaml/int32.ml
lib/ocaml/int32.mli
%%PROF%%lib/ocaml/int32.p.cmx
lib/ocaml/int64.cmi
lib/ocaml/int64.cmx
%%PROF%%lib/ocaml/int64.p.cmx
lib/ocaml/int64.ml
lib/ocaml/int64.mli
%%PROF%%lib/ocaml/int64.p.cmx
lib/ocaml/int_misc.cmx
%%TK%%lib/ocaml/labltk/balloon.cmi
%%TK%%lib/ocaml/labltk/balloon.cmx
%%TK%%lib/ocaml/labltk/balloon.mli
%%TK%%lib/ocaml/labltk/bell.cmi
%%TK%%lib/ocaml/labltk/bell.cmx
%%TK%%lib/ocaml/labltk/bell.mli
%%TK%%lib/ocaml/labltk/button.cmi
%%TK%%lib/ocaml/labltk/button.cmx
%%TK%%lib/ocaml/labltk/button.mli
%%TK%%lib/ocaml/labltk/cBell.cmi
%%TK%%lib/ocaml/labltk/cBell.cmx
%%TK%%lib/ocaml/labltk/cBell.mli
%%TK%%lib/ocaml/labltk/cButton.cmi
%%TK%%lib/ocaml/labltk/cButton.cmx
%%TK%%lib/ocaml/labltk/cButton.mli
%%TK%%lib/ocaml/labltk/cCanvas.cmi
%%TK%%lib/ocaml/labltk/cCanvas.cmx
%%TK%%lib/ocaml/labltk/cCanvas.mli
%%TK%%lib/ocaml/labltk/cCheckbutton.cmi
%%TK%%lib/ocaml/labltk/cCheckbutton.cmx
%%TK%%lib/ocaml/labltk/cCheckbutton.mli
%%TK%%lib/ocaml/labltk/cClipboard.cmi
%%TK%%lib/ocaml/labltk/cClipboard.cmx
%%TK%%lib/ocaml/labltk/cClipboard.mli
%%TK%%lib/ocaml/labltk/cDialog.cmi
%%TK%%lib/ocaml/labltk/cDialog.cmx
%%TK%%lib/ocaml/labltk/cDialog.mli
%%TK%%lib/ocaml/labltk/cEncoding.cmi
%%TK%%lib/ocaml/labltk/cEncoding.cmx
%%TK%%lib/ocaml/labltk/cEncoding.mli
%%TK%%lib/ocaml/labltk/cEntry.cmi
%%TK%%lib/ocaml/labltk/cEntry.cmx
%%TK%%lib/ocaml/labltk/cEntry.mli
%%TK%%lib/ocaml/labltk/cFocus.cmi
%%TK%%lib/ocaml/labltk/cFocus.cmx
%%TK%%lib/ocaml/labltk/cFocus.mli
%%TK%%lib/ocaml/labltk/cFont.cmi
%%TK%%lib/ocaml/labltk/cFont.cmx
%%TK%%lib/ocaml/labltk/cFont.mli
%%TK%%lib/ocaml/labltk/cFrame.cmi
%%TK%%lib/ocaml/labltk/cFrame.cmx
%%TK%%lib/ocaml/labltk/cFrame.mli
%%TK%%lib/ocaml/labltk/cGrab.cmi
%%TK%%lib/ocaml/labltk/cGrab.cmx
%%TK%%lib/ocaml/labltk/cGrab.mli
%%TK%%lib/ocaml/labltk/cGrid.cmi
%%TK%%lib/ocaml/labltk/cGrid.cmx
%%TK%%lib/ocaml/labltk/cGrid.mli
%%TK%%lib/ocaml/labltk/cImage.cmi
%%TK%%lib/ocaml/labltk/cImage.cmx
%%TK%%lib/ocaml/labltk/cImage.mli
%%TK%%lib/ocaml/labltk/cImagebitmap.cmi
%%TK%%lib/ocaml/labltk/cImagebitmap.cmx
%%TK%%lib/ocaml/labltk/cImagebitmap.mli
%%TK%%lib/ocaml/labltk/cImagephoto.cmi
%%TK%%lib/ocaml/labltk/cImagephoto.cmx
%%TK%%lib/ocaml/labltk/cImagephoto.mli
%%TK%%lib/ocaml/labltk/cLabel.cmi
%%TK%%lib/ocaml/labltk/cLabel.cmx
%%TK%%lib/ocaml/labltk/cLabel.mli
%%TK%%lib/ocaml/labltk/cListbox.cmi
%%TK%%lib/ocaml/labltk/cListbox.cmx
%%TK%%lib/ocaml/labltk/cListbox.mli
%%TK%%lib/ocaml/labltk/cMenu.cmi
%%TK%%lib/ocaml/labltk/cMenu.cmx
%%TK%%lib/ocaml/labltk/cMenu.mli
%%TK%%lib/ocaml/labltk/cMenubutton.cmi
%%TK%%lib/ocaml/labltk/cMenubutton.cmx
%%TK%%lib/ocaml/labltk/cMenubutton.mli
%%TK%%lib/ocaml/labltk/cMessage.cmi
%%TK%%lib/ocaml/labltk/cMessage.cmx
%%TK%%lib/ocaml/labltk/cMessage.mli
%%TK%%lib/ocaml/labltk/cOption.cmi
%%TK%%lib/ocaml/labltk/cOption.cmx
%%TK%%lib/ocaml/labltk/cOption.mli
%%TK%%lib/ocaml/labltk/cOptionmenu.cmi
%%TK%%lib/ocaml/labltk/cOptionmenu.cmx
%%TK%%lib/ocaml/labltk/cOptionmenu.mli
%%TK%%lib/ocaml/labltk/cPack.cmi
%%TK%%lib/ocaml/labltk/cPack.cmx
%%TK%%lib/ocaml/labltk/cPack.mli
%%TK%%lib/ocaml/labltk/cPalette.cmi
%%TK%%lib/ocaml/labltk/cPalette.cmx
%%TK%%lib/ocaml/labltk/cPalette.mli
%%TK%%lib/ocaml/labltk/cPixmap.cmi
%%TK%%lib/ocaml/labltk/cPixmap.cmx
%%TK%%lib/ocaml/labltk/cPixmap.mli
%%TK%%lib/ocaml/labltk/cPlace.cmi
%%TK%%lib/ocaml/labltk/cPlace.cmx
%%TK%%lib/ocaml/labltk/cPlace.mli
%%TK%%lib/ocaml/labltk/cRadiobutton.cmi
%%TK%%lib/ocaml/labltk/cRadiobutton.cmx
%%TK%%lib/ocaml/labltk/cRadiobutton.mli
%%TK%%lib/ocaml/labltk/cResource.cmi
%%TK%%lib/ocaml/labltk/cResource.cmx
%%TK%%lib/ocaml/labltk/cResource.mli
%%TK%%lib/ocaml/labltk/cScale.cmi
%%TK%%lib/ocaml/labltk/cScale.cmx
%%TK%%lib/ocaml/labltk/cScale.mli
%%TK%%lib/ocaml/labltk/cScrollbar.cmi
%%TK%%lib/ocaml/labltk/cScrollbar.cmx
%%TK%%lib/ocaml/labltk/cScrollbar.mli
%%TK%%lib/ocaml/labltk/cSelection.cmi
%%TK%%lib/ocaml/labltk/cSelection.cmx
%%TK%%lib/ocaml/labltk/cSelection.mli
%%TK%%lib/ocaml/labltk/cText.cmi
%%TK%%lib/ocaml/labltk/cText.cmx
%%TK%%lib/ocaml/labltk/cText.mli
%%TK%%lib/ocaml/labltk/cTk.cmi
%%TK%%lib/ocaml/labltk/cTk.cmx
%%TK%%lib/ocaml/labltk/cTkvars.cmi
%%TK%%lib/ocaml/labltk/cTkvars.cmx
%%TK%%lib/ocaml/labltk/cTkvars.mli
%%TK%%lib/ocaml/labltk/cTkwait.cmi
%%TK%%lib/ocaml/labltk/cTkwait.cmx
%%TK%%lib/ocaml/labltk/cTkwait.mli
%%TK%%lib/ocaml/labltk/cToplevel.cmi
%%TK%%lib/ocaml/labltk/cToplevel.cmx
%%TK%%lib/ocaml/labltk/cToplevel.mli
%%TK%%lib/ocaml/labltk/cWinfo.cmi
%%TK%%lib/ocaml/labltk/cWinfo.cmx
%%TK%%lib/ocaml/labltk/cWinfo.mli
%%TK%%lib/ocaml/labltk/cWm.cmi
%%TK%%lib/ocaml/labltk/cWm.cmx
%%TK%%lib/ocaml/labltk/cWm.mli
%%TK%%lib/ocaml/labltk/camltk.cmi
%%TK%%lib/ocaml/labltk/camltk.cmx
%%TK%%lib/ocaml/labltk/canvas.cmi
%%TK%%lib/ocaml/labltk/canvas.cmx
%%TK%%lib/ocaml/labltk/canvas.mli
%%TK%%lib/ocaml/labltk/checkbutton.cmi
%%TK%%lib/ocaml/labltk/checkbutton.cmx
%%TK%%lib/ocaml/labltk/checkbutton.mli
%%TK%%lib/ocaml/labltk/clipboard.cmi
%%TK%%lib/ocaml/labltk/clipboard.cmx
%%TK%%lib/ocaml/labltk/clipboard.mli
%%TK%%lib/ocaml/labltk/dialog.cmi
%%TK%%lib/ocaml/labltk/dialog.cmx
%%TK%%lib/ocaml/labltk/dialog.mli
%%TK%%lib/ocaml/labltk/encoding.cmi
%%TK%%lib/ocaml/labltk/encoding.cmx
%%TK%%lib/ocaml/labltk/encoding.mli
%%TK%%lib/ocaml/labltk/entry.cmi
%%TK%%lib/ocaml/labltk/entry.cmx
%%TK%%lib/ocaml/labltk/entry.mli
%%TK%%lib/ocaml/labltk/fileevent.cmi
%%TK%%lib/ocaml/labltk/fileevent.cmx
%%TK%%lib/ocaml/labltk/fileevent.mli
%%TK%%lib/ocaml/labltk/fileselect.cmi
%%TK%%lib/ocaml/labltk/fileselect.cmx
%%TK%%lib/ocaml/labltk/fileselect.mli
%%TK%%lib/ocaml/labltk/focus.cmi
%%TK%%lib/ocaml/labltk/focus.cmx
%%TK%%lib/ocaml/labltk/focus.mli
%%TK%%lib/ocaml/labltk/font.cmi
%%TK%%lib/ocaml/labltk/font.cmx
%%TK%%lib/ocaml/labltk/font.mli
%%TK%%lib/ocaml/labltk/frame.cmi
%%TK%%lib/ocaml/labltk/frame.cmx
%%TK%%lib/ocaml/labltk/frame.mli
%%TK%%lib/ocaml/labltk/frx_after.cmi
%%TK%%lib/ocaml/labltk/frx_after.mli
%%TK%%lib/ocaml/labltk/frx_color.cmi
%%TK%%lib/ocaml/labltk/frx_color.mli
%%TK%%lib/ocaml/labltk/frx_ctext.cmi
%%TK%%lib/ocaml/labltk/frx_ctext.mli
%%TK%%lib/ocaml/labltk/frx_dialog.cmi
%%TK%%lib/ocaml/labltk/frx_dialog.mli
%%TK%%lib/ocaml/labltk/frx_entry.cmi
%%TK%%lib/ocaml/labltk/frx_entry.mli
%%TK%%lib/ocaml/labltk/frx_fillbox.cmi
%%TK%%lib/ocaml/labltk/frx_fillbox.mli
%%TK%%lib/ocaml/labltk/frx_fit.cmi
%%TK%%lib/ocaml/labltk/frx_fit.mli
%%TK%%lib/ocaml/labltk/frx_focus.cmi
%%TK%%lib/ocaml/labltk/frx_focus.mli
%%TK%%lib/ocaml/labltk/frx_font.cmi
%%TK%%lib/ocaml/labltk/frx_font.mli
%%TK%%lib/ocaml/labltk/frx_lbutton.mli
%%TK%%lib/ocaml/labltk/frx_listbox.cmi
%%TK%%lib/ocaml/labltk/frx_listbox.mli
%%TK%%lib/ocaml/labltk/frx_mem.cmi
%%TK%%lib/ocaml/labltk/frx_mem.mli
%%TK%%lib/ocaml/labltk/frx_misc.cmi
%%TK%%lib/ocaml/labltk/frx_misc.mli
%%TK%%lib/ocaml/labltk/frx_req.cmi
%%TK%%lib/ocaml/labltk/frx_req.mli
%%TK%%lib/ocaml/labltk/frx_rpc.cmi
%%TK%%lib/ocaml/labltk/frx_rpc.mli
%%TK%%lib/ocaml/labltk/frx_selection.cmi
%%TK%%lib/ocaml/labltk/frx_selection.mli
%%TK%%lib/ocaml/labltk/frx_synth.cmi
%%TK%%lib/ocaml/labltk/frx_synth.mli
%%TK%%lib/ocaml/labltk/frx_text.cmi
%%TK%%lib/ocaml/labltk/frx_text.mli
%%TK%%lib/ocaml/labltk/frx_toplevel.mli
%%TK%%lib/ocaml/labltk/frx_widget.cmi
%%TK%%lib/ocaml/labltk/frx_widget.mli
%%TK%%lib/ocaml/labltk/frxlib.a
%%TK%%lib/ocaml/labltk/frxlib.cma
%%TK%%lib/ocaml/labltk/frxlib.cmxa
%%TK%%lib/ocaml/labltk/grab.cmi
%%TK%%lib/ocaml/labltk/grab.cmx
%%TK%%lib/ocaml/labltk/grab.mli
%%TK%%lib/ocaml/labltk/grid.cmi
%%TK%%lib/ocaml/labltk/grid.cmx
%%TK%%lib/ocaml/labltk/grid.mli
%%TK%%lib/ocaml/labltk/image.cmi
%%TK%%lib/ocaml/labltk/image.cmx
%%TK%%lib/ocaml/labltk/image.mli
%%TK%%lib/ocaml/labltk/imagebitmap.cmi
%%TK%%lib/ocaml/labltk/imagebitmap.cmx
%%TK%%lib/ocaml/labltk/imagebitmap.mli
%%TK%%lib/ocaml/labltk/imagephoto.cmi
%%TK%%lib/ocaml/labltk/imagephoto.cmx
%%TK%%lib/ocaml/labltk/imagephoto.mli
%%TK%%lib/ocaml/labltk/jpf_font.cmi
%%TK%%lib/ocaml/labltk/jpf_font.cmx
%%TK%%lib/ocaml/labltk/jpf_font.mli
%%TK%%lib/ocaml/labltk/jpflib.a
%%TK%%lib/ocaml/labltk/jpflib.cma
%%TK%%lib/ocaml/labltk/jpflib.cmxa
%%TK%%lib/ocaml/labltk/label.cmi
%%TK%%lib/ocaml/labltk/label.cmx
%%TK%%lib/ocaml/labltk/label.mli
%%TK%%lib/ocaml/labltk/labltk.a
%%TK%%lib/ocaml/labltk/labltk.cma
%%TK%%lib/ocaml/labltk/labltk.cmi
%%TK%%lib/ocaml/labltk/labltk.cmx
%%TK%%lib/ocaml/labltk/labltk.cmxa
%%TK%%lib/ocaml/labltk/labltktop
%%TK%%lib/ocaml/labltk/liblabltk.a
%%TK%%lib/ocaml/labltk/listbox.cmi
%%TK%%lib/ocaml/labltk/listbox.cmx
%%TK%%lib/ocaml/labltk/listbox.mli
%%TK%%lib/ocaml/labltk/menu.cmi
%%TK%%lib/ocaml/labltk/menu.cmx
%%TK%%lib/ocaml/labltk/menu.mli
%%TK%%lib/ocaml/labltk/menubutton.cmi
%%TK%%lib/ocaml/labltk/menubutton.cmx
%%TK%%lib/ocaml/labltk/menubutton.mli
%%TK%%lib/ocaml/labltk/message.cmi
%%TK%%lib/ocaml/labltk/message.cmx
%%TK%%lib/ocaml/labltk/message.mli
%%TK%%lib/ocaml/labltk/option.cmi
%%TK%%lib/ocaml/labltk/option.cmx
%%TK%%lib/ocaml/labltk/option.mli
%%TK%%lib/ocaml/labltk/optionmenu.cmi
%%TK%%lib/ocaml/labltk/optionmenu.cmx
%%TK%%lib/ocaml/labltk/optionmenu.mli
%%TK%%lib/ocaml/labltk/pack.cmi
%%TK%%lib/ocaml/labltk/pack.cmx
%%TK%%lib/ocaml/labltk/pack.mli
%%TK%%lib/ocaml/labltk/palette.cmi
%%TK%%lib/ocaml/labltk/palette.cmx
%%TK%%lib/ocaml/labltk/palette.mli
%%TK%%lib/ocaml/labltk/pixmap.cmi
%%TK%%lib/ocaml/labltk/pixmap.cmx
%%TK%%lib/ocaml/labltk/pixmap.mli
%%TK%%lib/ocaml/labltk/place.cmi
%%TK%%lib/ocaml/labltk/place.cmx
%%TK%%lib/ocaml/labltk/place.mli
%%TK%%lib/ocaml/labltk/pp
%%TK%%lib/ocaml/labltk/protocol.cmi
%%TK%%lib/ocaml/labltk/protocol.cmx
%%TK%%lib/ocaml/labltk/protocol.mli
%%TK%%lib/ocaml/labltk/radiobutton.cmi
%%TK%%lib/ocaml/labltk/radiobutton.cmx
%%TK%%lib/ocaml/labltk/radiobutton.mli
%%TK%%lib/ocaml/labltk/rawwidget.cmi
%%TK%%lib/ocaml/labltk/rawwidget.cmx
%%TK%%lib/ocaml/labltk/rawwidget.mli
%%TK%%lib/ocaml/labltk/scale.cmi
%%TK%%lib/ocaml/labltk/scale.cmx
%%TK%%lib/ocaml/labltk/scale.mli
%%TK%%lib/ocaml/labltk/scrollbar.cmi
%%TK%%lib/ocaml/labltk/scrollbar.cmx
%%TK%%lib/ocaml/labltk/scrollbar.mli
%%TK%%lib/ocaml/labltk/selection.cmi
%%TK%%lib/ocaml/labltk/selection.cmx
%%TK%%lib/ocaml/labltk/selection.mli
%%TK%%lib/ocaml/labltk/shell.cmi
%%TK%%lib/ocaml/labltk/shell.cmx
%%TK%%lib/ocaml/labltk/shell.mli
%%TK%%lib/ocaml/labltk/text.cmi
%%TK%%lib/ocaml/labltk/text.cmx
%%TK%%lib/ocaml/labltk/text.mli
%%TK%%lib/ocaml/labltk/textvariable.cmi
%%TK%%lib/ocaml/labltk/textvariable.cmx
%%TK%%lib/ocaml/labltk/textvariable.mli
%%TK%%lib/ocaml/labltk/timer.cmi
%%TK%%lib/ocaml/labltk/timer.cmx
%%TK%%lib/ocaml/labltk/timer.mli
%%TK%%lib/ocaml/labltk/tk.cmi
%%TK%%lib/ocaml/labltk/tk.cmx
%%TK%%lib/ocaml/labltk/tkcompiler
%%TK%%lib/ocaml/labltk/tkthread.cmi
%%TK%%lib/ocaml/labltk/tkthread.cmo
%%TK%%lib/ocaml/labltk/tkthread.cmx
%%TK%%lib/ocaml/labltk/tkthread.mli
%%TK%%lib/ocaml/labltk/tkthread.o
%%TK%%lib/ocaml/labltk/tkvars.cmi
%%TK%%lib/ocaml/labltk/tkvars.cmx
%%TK%%lib/ocaml/labltk/tkvars.mli
%%TK%%lib/ocaml/labltk/tkwait.cmi
%%TK%%lib/ocaml/labltk/tkwait.cmx
%%TK%%lib/ocaml/labltk/tkwait.mli
%%TK%%lib/ocaml/labltk/toplevel.cmi
%%TK%%lib/ocaml/labltk/toplevel.cmx
%%TK%%lib/ocaml/labltk/toplevel.mli
%%TK%%lib/ocaml/labltk/widget.cmi
%%TK%%lib/ocaml/labltk/widget.cmx
%%TK%%lib/ocaml/labltk/widget.mli
%%TK%%lib/ocaml/labltk/winfo.cmi
%%TK%%lib/ocaml/labltk/winfo.cmx
%%TK%%lib/ocaml/labltk/winfo.mli
%%TK%%lib/ocaml/labltk/wm.cmi
%%TK%%lib/ocaml/labltk/wm.cmx
%%TK%%lib/ocaml/labltk/wm.mli
lib/ocaml/lazy.cmi
lib/ocaml/lazy.cmx
%%PROF%%lib/ocaml/lazy.p.cmx
lib/ocaml/lazy.ml
lib/ocaml/lazy.mli
%%PROF%%lib/ocaml/lazy.p.cmx
lib/ocaml/ld.conf
lib/ocaml/lexing.cmi
lib/ocaml/lexing.cmx
%%PROF%%lib/ocaml/lexing.p.cmx
lib/ocaml/lexing.ml
lib/ocaml/lexing.mli
%%PROF%%lib/ocaml/lexing.p.cmx
lib/ocaml/libasmrun.a
lib/ocaml/libasmrunp.a
lib/ocaml/libbigarray.a

lib/ocaml/libunix.a
lib/ocaml/list.cmi
lib/ocaml/list.cmx
%%PROF%%lib/ocaml/list.p.cmx
lib/ocaml/list.ml
lib/ocaml/list.mli
%%PROF%%lib/ocaml/list.p.cmx
lib/ocaml/listLabels.cmi
lib/ocaml/listLabels.cmx
%%PROF%%lib/ocaml/listLabels.p.cmx
lib/ocaml/listLabels.ml
lib/ocaml/listLabels.mli
%%PROF%%lib/ocaml/listLabels.p.cmx
lib/ocaml/map.cmi
lib/ocaml/map.cmx
%%PROF%%lib/ocaml/map.p.cmx
lib/ocaml/map.ml
lib/ocaml/map.mli
%%PROF%%lib/ocaml/map.p.cmx
lib/ocaml/marshal.cmi
lib/ocaml/marshal.cmx
%%PROF%%lib/ocaml/marshal.p.cmx
lib/ocaml/marshal.ml
lib/ocaml/marshal.mli
%%PROF%%lib/ocaml/marshal.p.cmx
lib/ocaml/moreLabels.cmi
lib/ocaml/moreLabels.cmx
%%PROF%%lib/ocaml/moreLabels.p.cmx
lib/ocaml/moreLabels.ml
lib/ocaml/moreLabels.mli
%%PROF%%lib/ocaml/moreLabels.p.cmx
%%THREADS%%lib/ocaml/mutex.mli
lib/ocaml/nat.cmi
lib/ocaml/nat.cmx
lib/ocaml/nat.mli
lib/ocaml/nativeint.cmi
lib/ocaml/nativeint.cmx
%%PROF%%lib/ocaml/nativeint.p.cmx
lib/ocaml/nativeint.ml
lib/ocaml/nativeint.mli
%%PROF%%lib/ocaml/nativeint.p.cmx
lib/ocaml/num.cmi
lib/ocaml/num.cmx
lib/ocaml/num.mli

lib/ocaml/nums.cmxs
lib/ocaml/obj.cmi
lib/ocaml/obj.cmx
%%PROF%%lib/ocaml/obj.p.cmx
lib/ocaml/obj.ml
lib/ocaml/obj.mli
%%PROF%%lib/ocaml/obj.p.cmx
lib/ocaml/objinfo_helper
lib/ocaml/ocamlbuild/ocamlbuild.cmo
lib/ocaml/ocamlbuild/ocamlbuild.cmx
lib/ocaml/ocamlbuild/ocamlbuild.o
lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo
lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
lib/ocaml/ocamlbuild/ocamlbuild_executor.o
lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmo
lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
lib/ocaml/ocamlbuild/ocamlbuildlib.a

lib/ocaml/ocamldoc/odoc_dot.cmi
lib/ocaml/ocamldoc/odoc_env.cmi
lib/ocaml/ocamldoc/odoc_exception.cmi
lib/ocaml/ocamldoc/odoc_extension.cmi
lib/ocaml/ocamldoc/odoc_gen.cmi
lib/ocaml/ocamldoc/odoc_global.cmi
lib/ocaml/ocamldoc/odoc_html.cmi

lib/ocaml/ocamldoc/odoc_value.cmi
lib/ocaml/oo.cmi
lib/ocaml/oo.cmx
%%PROF%%lib/ocaml/oo.p.cmx
lib/ocaml/oo.ml
lib/ocaml/oo.mli
%%PROF%%lib/ocaml/oo.p.cmx
lib/ocaml/parsing.cmi
lib/ocaml/parsing.cmx
%%PROF%%lib/ocaml/parsing.p.cmx
lib/ocaml/parsing.ml
lib/ocaml/parsing.mli
%%PROF%%lib/ocaml/parsing.p.cmx
lib/ocaml/pervasives.cmi
lib/ocaml/pervasives.cmx
%%PROF%%lib/ocaml/pervasives.p.cmx
lib/ocaml/pervasives.ml
lib/ocaml/pervasives.mli
%%PROF%%lib/ocaml/pervasives.p.cmx
lib/ocaml/printexc.cmi
lib/ocaml/printexc.cmx
%%PROF%%lib/ocaml/printexc.p.cmx
lib/ocaml/printexc.ml
lib/ocaml/printexc.mli
%%PROF%%lib/ocaml/printexc.p.cmx
lib/ocaml/printf.cmi
lib/ocaml/printf.cmx
%%PROF%%lib/ocaml/printf.p.cmx
lib/ocaml/printf.ml
lib/ocaml/printf.mli
%%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
%%PROF%%lib/ocaml/queue.p.cmx
lib/ocaml/queue.ml
lib/ocaml/queue.mli
%%PROF%%lib/ocaml/queue.p.cmx
lib/ocaml/random.cmi
lib/ocaml/random.cmx
%%PROF%%lib/ocaml/random.p.cmx
lib/ocaml/random.ml
lib/ocaml/random.mli
%%PROF%%lib/ocaml/random.p.cmx
lib/ocaml/ratio.cmi
lib/ocaml/ratio.cmx
lib/ocaml/ratio.mli
lib/ocaml/scanf.cmi
lib/ocaml/scanf.cmx
%%PROF%%lib/ocaml/scanf.p.cmx
lib/ocaml/scanf.ml
lib/ocaml/scanf.mli
%%PROF%%lib/ocaml/scanf.p.cmx
lib/ocaml/set.cmi
lib/ocaml/set.cmx
%%PROF%%lib/ocaml/set.p.cmx
lib/ocaml/set.ml
lib/ocaml/set.mli
%%PROF%%lib/ocaml/set.p.cmx
lib/ocaml/sort.cmi
lib/ocaml/sort.cmx
%%PROF%%lib/ocaml/sort.p.cmx
lib/ocaml/sort.ml
lib/ocaml/sort.mli
%%PROF%%lib/ocaml/sort.p.cmx
lib/ocaml/stack.cmi
lib/ocaml/stack.cmx
%%PROF%%lib/ocaml/stack.p.cmx
lib/ocaml/stack.ml
lib/ocaml/stack.mli
%%PROF%%lib/ocaml/stack.p.cmx
lib/ocaml/stdLabels.cmi
lib/ocaml/stdLabels.cmx
%%PROF%%lib/ocaml/stdLabels.p.cmx
lib/ocaml/stdLabels.ml
lib/ocaml/stdLabels.mli
%%PROF%%lib/ocaml/stdLabels.p.cmx
lib/ocaml/std_exit.cmi
lib/ocaml/std_exit.cmo
lib/ocaml/std_exit.cmx
lib/ocaml/std_exit.ml
lib/ocaml/std_exit.o
%%PROF%%lib/ocaml/std_exit.p.cmx
%%PROF%%lib/ocaml/std_exit.p.o
lib/ocaml/stdlib.a
lib/ocaml/stdlib.cma
lib/ocaml/stdlib.cmxa
%%PROF%%lib/ocaml/stdlib.p.a
%%PROF%%lib/ocaml/stdlib.p.cmxa
lib/ocaml/str.a
lib/ocaml/str.cma
lib/ocaml/str.cmi

lib/ocaml/str.mli
lib/ocaml/stream.cmi
lib/ocaml/stream.cmx
%%PROF%%lib/ocaml/stream.p.cmx
lib/ocaml/stream.ml
lib/ocaml/stream.mli
%%PROF%%lib/ocaml/stream.p.cmx
lib/ocaml/string.cmi
lib/ocaml/string.cmx
%%PROF%%lib/ocaml/string.p.cmx
lib/ocaml/string.ml
lib/ocaml/string.mli
%%PROF%%lib/ocaml/string.p.cmx
lib/ocaml/stringLabels.cmi
lib/ocaml/stringLabels.cmx
%%PROF%%lib/ocaml/stringLabels.p.cmx
lib/ocaml/stringLabels.ml
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/dllnums.so
%%THREADS%%lib/ocaml/stublibs/dllthreads.so
lib/ocaml/stublibs/dllunix.so
lib/ocaml/stublibs/dllvmthreads.so
lib/ocaml/sys.cmi
lib/ocaml/sys.cmx
%%PROF%%lib/ocaml/sys.p.cmx
lib/ocaml/sys.ml
lib/ocaml/sys.mli
%%PROF%%lib/ocaml/sys.p.cmx
%%THREADS%%lib/ocaml/thread.mli
%%THREADS%%lib/ocaml/threadUnix.mli
%%THREADS%%lib/ocaml/threads/condition.cmi

lib/ocaml/vmthreads/unix.cma
lib/ocaml/weak.cmi
lib/ocaml/weak.cmx
%%PROF%%lib/ocaml/weak.p.cmx
lib/ocaml/weak.ml
lib/ocaml/weak.mli
%%PROF%%lib/ocaml/weak.p.cmx
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/ocamlprof.1.gz
man/man1/ocamlrun.1.gz
man/man1/ocamlyacc.1.gz
man/man3/Arg.3o.gz
man/man3/Array.3o.gz
man/man3/ArrayLabels.3o.gz
man/man3/Ast_helper.3o.gz
man/man3/Ast_helper.Cf.3o.gz
man/man3/Ast_helper.Ci.3o.gz
man/man3/Ast_helper.Cl.3o.gz
man/man3/Ast_helper.Csig.3o.gz
man/man3/Ast_helper.Cstr.3o.gz
man/man3/Ast_helper.Ctf.3o.gz
man/man3/Ast_helper.Cty.3o.gz
man/man3/Ast_helper.Exp.3o.gz
man/man3/Ast_helper.Incl.3o.gz
man/man3/Ast_helper.Mb.3o.gz
man/man3/Ast_helper.Md.3o.gz
man/man3/Ast_helper.Mod.3o.gz
man/man3/Ast_helper.Mtd.3o.gz
man/man3/Ast_helper.Mty.3o.gz
man/man3/Ast_helper.Opn.3o.gz
man/man3/Ast_helper.Pat.3o.gz
man/man3/Ast_helper.Sig.3o.gz
man/man3/Ast_helper.Str.3o.gz
man/man3/Ast_helper.Te.3o.gz
man/man3/Ast_helper.Typ.3o.gz
man/man3/Ast_helper.Type.3o.gz
man/man3/Ast_helper.Val.3o.gz
man/man3/Ast_helper.Vb.3o.gz
man/man3/Ast_mapper.3o.gz
man/man3/Asttypes.3o.gz
man/man3/Bigarray.3o.gz
man/man3/Bigarray.Array1.3o.gz
man/man3/Bigarray.Array2.3o.gz
man/man3/Bigarray.Array3.3o.gz
man/man3/Bigarray.Genarray.3o.gz
man/man3/Buffer.3o.gz
man/man3/Bytes.3o.gz
man/man3/BytesLabels.3o.gz
man/man3/Callback.3o.gz
man/man3/CamlinternalFormat.3o.gz
man/man3/CamlinternalFormatBasics.3o.gz
man/man3/CamlinternalLazy.3o.gz
man/man3/CamlinternalMod.3o.gz
man/man3/CamlinternalOO.3o.gz
man/man3/Char.3o.gz
man/man3/Complex.3o.gz
man/man3/Digest.3o.gz
man/man3/Filename.3o.gz
man/man3/Format.3o.gz
man/man3/Gc.3o.gz
man/man3/Genlex.3o.gz
man/man3/Hashtbl.3o.gz
man/man3/Hashtbl.HashedType.3o.gz
man/man3/Hashtbl.Make.3o.gz
man/man3/Hashtbl.MakeSeeded.3o.gz
man/man3/Hashtbl.S.3o.gz
man/man3/Hashtbl.SeededHashedType.3o.gz
man/man3/Hashtbl.SeededS.3o.gz
man/man3/Int32.3o.gz
man/man3/Int64.3o.gz
man/man3/Lazy.3o.gz
man/man3/Lexer.3o.gz
man/man3/Lexing.3o.gz
man/man3/List.3o.gz
man/man3/ListLabels.3o.gz
man/man3/Location.3o.gz
man/man3/Longident.3o.gz
man/man3/Map.3o.gz
man/man3/Map.Make.3o.gz
man/man3/Map.OrderedType.3o.gz
man/man3/Map.S.3o.gz
man/man3/Marshal.3o.gz
man/man3/MoreLabels.3o.gz
man/man3/MoreLabels.Hashtbl.3o.gz
man/man3/MoreLabels.Hashtbl.HashedType.3o.gz
man/man3/MoreLabels.Hashtbl.Make.3o.gz
man/man3/MoreLabels.Hashtbl.MakeSeeded.3o.gz
man/man3/MoreLabels.Hashtbl.S.3o.gz
man/man3/MoreLabels.Hashtbl.SeededHashedType.3o.gz
man/man3/MoreLabels.Hashtbl.SeededS.3o.gz
man/man3/MoreLabels.Map.3o.gz
man/man3/MoreLabels.Map.Make.3o.gz
man/man3/MoreLabels.Map.OrderedType.3o.gz
man/man3/MoreLabels.Map.S.3o.gz
man/man3/MoreLabels.Set.3o.gz
man/man3/MoreLabels.Set.Make.3o.gz
man/man3/MoreLabels.Set.OrderedType.3o.gz
man/man3/MoreLabels.Set.S.3o.gz
man/man3/Nativeint.3o.gz
man/man3/Num.3o.gz
man/man3/Obj.3o.gz
man/man3/Oo.3o.gz
man/man3/Parse.3o.gz
man/man3/Parser.3o.gz
man/man3/Parsetree.3o.gz
man/man3/Parsing.3o.gz
man/man3/Pervasives.3o.gz
man/man3/Pervasives.LargeFile.3o.gz
man/man3/Pprintast.3o.gz
man/man3/Pprintast.printer.3o.gz
man/man3/Printast.3o.gz
man/man3/Printexc.3o.gz
man/man3/Printexc.Slot.3o.gz
man/man3/Printf.3o.gz
man/man3/Queue.3o.gz
man/man3/Random.3o.gz
man/man3/Random.State.3o.gz
man/man3/Scanf.3o.gz
man/man3/Scanf.Scanning.3o.gz
man/man3/Set.3o.gz
man/man3/Set.Make.3o.gz
man/man3/Set.OrderedType.3o.gz
man/man3/Set.S.3o.gz
man/man3/Sort.3o.gz
man/man3/Stack.3o.gz
man/man3/StdLabels.3o.gz
man/man3/StdLabels.Array.3o.gz
man/man3/StdLabels.Bytes.3o.gz
man/man3/StdLabels.List.3o.gz
man/man3/StdLabels.String.3o.gz
man/man3/Str.3o.gz
man/man3/Stream.3o.gz
man/man3/String.3o.gz
man/man3/StringLabels.3o.gz
man/man3/Syntaxerr.3o.gz
man/man3/Sys.3o.gz
man/man3/Unix.3o.gz
man/man3/Unix.LargeFile.3o.gz
man/man3/Weak.3o.gz
man/man3/Weak.Make.3o.gz
man/man3/Weak.S.3o.gz
@dir lib/ocaml/caml
@dir lib/ocaml/compiler-libs
@dir lib/ocaml/ocamlbuild
@dir lib/ocaml/ocamldoc/custom
@dir lib/ocaml/ocamldoc
@dir lib/ocaml/stublibs
%%THREADS%%@dir lib/ocaml/threads
@dir lib/ocaml/vmthreads
@dir lib/ocaml

Return to bug 195736

Lines 3-10 Link Here

(-)b/lang/ocaml/Makefile (-45 / +5 lines)
3		3
4	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated	4	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
5	PORTNAME= ocaml	5	PORTNAME= ocaml
6	PORTVERSION= 4.01.0	6	PORTVERSION= 4.02.1
7	PORTREVISION= 4
8	CATEGORIES= lang	7	CATEGORIES= lang
9	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \	8	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
10	${MASTER_SITE_GENTOO}	9	${MASTER_SITE_GENTOO}
Lines 22-28 LICENSE_NAME_QPL10= Q Public License, Version 1.0 Link Here
22	LICENSE_FILE_QPL10= ${WRKSRC}/LICENSE	21	LICENSE_FILE_QPL10= ${WRKSRC}/LICENSE
23	LICENSE_PERMS_QPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	22	LICENSE_PERMS_QPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
24		23
25	USES= gmake tar:bzip2	24	USES= gmake tar:xz
26	REINPLACE_ARGS= -i ""	25	REINPLACE_ARGS= -i ""
27	HAS_CONFIGURE= yes	26	HAS_CONFIGURE= yes
28	ALL_TARGET= world.opt	27	ALL_TARGET= world.opt
Lines 37-45 CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ Link Here
37	-aspp "${CC} -c" \	36	-aspp "${CC} -c" \
38	-partialld "${LD} -r"	37	-partialld "${LD} -r"
39		38
40	OPTIONS_DEFINE= X11 TK THREADS DOCS EXAMPLES	39	OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES
41	OPTIONS_DEFAULT=X11 TK THREADS	40	OPTIONS_DEFAULT=X11 THREADS
42	TK_DESC= LablTk library (requires X11 support)
43	CMP_LIB_DESC= Install compiler libraries	41	CMP_LIB_DESC= Install compiler libraries
44	PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz \	42	PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz \
45	${DOCSDISTNAME}-refman.pdf	43	${DOCSDISTNAME}-refman.pdf
Lines 92-121 CONFLICTS+= ocaml-[0-9]* Link Here
92	CONFIGURE_ARGS+=-no-graph	90	CONFIGURE_ARGS+=-no-graph
93	.endif	91	.endif
94		92
95	.if ${PORT_OPTIONS:MTK}
96	. if ${PORT_OPTIONS:MEXAMPLES}
97	PORTEXAMPLES= examples_camltk examples_labltk
98	.endif
99	. if ! ${PORT_OPTIONS:MX11}
100	IGNORE=requires X11 support to build TK bindings
101	. endif
102	USES+= tk:84+
103	PLIST_SUB+= TK=""
104	CONFIGURE_ARGS+= -tkdefs \
105	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
106	-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S\|.\|\|} \
107	-ltcl${TCL_VER:S\|.\|\|} ${THR_LD}"
108	.else
109	PLIST_SUB+= TK="@comment "
110	CONFIGURE_ARGS+=-no-tk
111	.endif
112
113	.include <bsd.port.pre.mk>	93	.include <bsd.port.pre.mk>
114	.include "${FILESDIR}/manfiles"	94	.include "${FILESDIR}/manfiles"
115		95
116	OCAML_ARCH= ${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}	96	OCAML_ARCH= ${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}
117		97
118	.if defined(NO_PROFILE) \|\| ${OCAML_ARCH} == power	98	.if defined(NO_PROFILE) \|\| ${OCAML_ARCH} == power \|\| ${OCAML_ARCH} == amd64
119	PLIST_SUB+= PROF="@comment "	99	PLIST_SUB+= PROF="@comment "
120	.else	100	.else
121	PLIST_SUB+= PROF=""	101	PLIST_SUB+= PROF=""
Lines 145-160 post-patch: Link Here
145	-e 's\|-lbfd -ldl\|-lbfd $$dllib\|' \	125	-e 's\|-lbfd -ldl\|-lbfd $$dllib\|' \
146	${WRKSRC}/configure	126	${WRKSRC}/configure
147	# don't hardcode gcc for depend target	127	# don't hardcode gcc for depend target
148	# be aware of staging
149	@${REINPLACE_CMD} -E \
150	-e 's\|gcc\|$$(CC)\|' \
151	-e '/^install/,/^$$/s@\$$\(((INSTALL_)?(BIN\|LIB\|STUBLIB\|COMPLIB\|MANO?\|INSTALL\|INSTALL_CUSTOM)DIR)\)@$$(STAGEDIR)$$(\1)@g' \
152	`find ${WRKSRC} -name 'Makefile*'`
153	@${REINPLACE_CMD} -E -e 's/^DIR=/DIR=$$(STAGEDIR)/' ${WRKSRC}/man/Makefile
154	.if ${PORT_OPTIONS:MTK}
155	@${REINPLACE_CMD} -e 's\|/usr/bin/wish\|${WISH}\|' \
156	${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
157	.endif
158		128
159	post-configure:	129	post-configure:
160	# CFLAGS safeness	130	# CFLAGS safeness
Lines 181-196 check test: install Link Here
181	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report	151	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
182		152
183	post-install:	153	post-install:
184	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/ocamldoc/custom
185	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/ocaml/expunge
186	.if ${PORT_OPTIONS:MTK}
187	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
188	(cd ${WRKSRC}/otherlibs/labltk && \
189	${COPYTREE_SHARE} examples_labltk ${STAGEDIR}${EXAMPLESDIR} \
190	"! -name .ignore" && \
191	${COPYTREE_SHARE} examples_camltk ${STAGEDIR}${EXAMPLESDIR} \
192	"! -name .ignore")
193	.endif
194	.if ${PORT_OPTIONS:MDOCS}	154	.if ${PORT_OPTIONS:MDOCS}
195	${MKDIR} ${STAGEDIR}${DOCSDIR}	155	${MKDIR} ${STAGEDIR}${DOCSDIR}
196	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})	156	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})

Removed Link Here

(-)a/lang/ocaml/files/patch-Makefile (-28 lines)
1	--- Makefile.orig 2013-06-17 15:15:18.000000000 +0200
2	+++ Makefile 2014-04-01 08:23:13.000000000 +0200
3	@@ -298,7 +298,7 @@
4	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
5	else :; fi
6	cp config/Makefile $(LIBDIR)/Makefile.config
7	- BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
8	+ BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) PREFIX=$(PREFIX) \
9	./build/partial-install.sh
10
11	# Installation of the native-code compiler
12	@@ -318,14 +318,14 @@
13	cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
14	cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
15	cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
16	+ $(RANLIB) compilerlibs/ocamlcommon.a compilerlibs/ocamlbytecomp.a \
17	+ compilerlibs/ocamloptcomp.a
18	cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
19	compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
20	compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
21	$(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
22	$(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
23	$(COMPLIBDIR)
24	- cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
25	- ocamloptcomp.a
26
27	clean:: partialclean
28

Removed Link Here

(-)a/lang/ocaml/files/patch-asmrun-Makefile (-25 lines)
1	--- asmrun/Makefile.orig 2013-06-24 10:16:27.000000000 +0200
2	+++ asmrun/Makefile 2014-04-01 07:12:29.000000000 +0200
3	@@ -64,14 +64,12 @@
4
5	install-default:
6	cp libasmrun.a $(LIBDIR)/libasmrun.a
7	- cd $(LIBDIR); $(RANLIB) libasmrun.a
8
9	install-noruntimed:
10	.PHONY: install-noruntimed
11
12	install-runtimed:
13	cp libasmrund.a $(LIBDIR)/libasmrund.a
14	- cd $(LIBDIR); $(RANLIB) libasmrund.a
15	.PHONY: install-runtimed
16
17	install-noprof:
18	@@ -79,7 +77,6 @@
19
20	install-prof:
21	cp libasmrunp.a $(LIBDIR)/libasmrunp.a
22	- cd $(LIBDIR); $(RANLIB) libasmrunp.a
23
24	power-bsd_elf.S: power-elf.S
25	cp power-elf.S power-bsd_elf.S

Removed Link Here

(-)a/lang/ocaml/files/patch-asmrun__arm.S (-18 lines)
1	--- ./asmrun/arm.S.orig 2014-04-28 13:10:19.000000000 +0100
2	+++ ./asmrun/arm.S 2014-04-28 13:10:42.000000000 +0100
3	@@ -44,6 +44,15 @@
4	cmp \reg, #0
5	beq \lbl
6	.endm
7	+#elif defined(SYS_freebsd)
8	+ .arch armv6
9	+ .arm
10	+
11	+ /* Compatibility macros */
12	+ .macro cbz reg, lbl
13	+ cmp \reg, #0
14	+ beq \lbl
15	+ .endm
16	#endif
17
18	trap_ptr .req r8

Removed Link Here

(-)a/lang/ocaml/files/patch-camlp4-man_Makefile (-21 lines)
1	--- camlp4/man/Makefile.orig 2012-07-17 11:31:12.000000000 -0400
2	+++ camlp4/man/Makefile 2013-11-21 03:16:26.000000000 -0500
3	@@ -14,7 +14,6 @@
4	include ../config/Makefile.cnf
5
6	TARGET=camlp4.1
7	-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
8
9	include ../config/Makefile.base
10
11	@@ -22,10 +21,6 @@
12	if test -n '$(MANDIR)'; then \
13	$(MKDIR) $(MANDIR)/man1 ; \
14	cp $(TARGET) $(MANDIR)/man1/. ; \
15	- for i in $(ALIASES); do \
16	- rm -f $(MANDIR)/man1/$$i; \
17	- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
18	- done; \
19	fi
20
21	camlp4.1: camlp4.1.tpl

Lines 1-202 Link Here

(-)b/lang/ocaml/files/patch-configure (-199 / +7 lines)
1	--- configure.orig 2014-05-08 09:28:26.000000000 +0200	1	--- configure.orig 2014-12-06 11:33:20.000000000 +0000
2	+++ configure 2014-05-08 09:31:54.000000000 +0200	2	+++ configure 2014-12-06 11:33:37.000000000 +0000
3	@@ -545,9 +545,10 @@ if test $withsharedlibs = "yes"; then	3	@@ -1560,6 +1560,7 @@
4	mksharedlib="$flexlink"	4	else
5	mkmaindll="$flexlink -maindll"
6	shared_libraries_supported=true;;
7	- --linux-gnu\|--linux\|--freebsd[3-9]\|--freebsd[1-9][0-9]\|--openbsd\|--netbsd\|--gnu*)
8	+ --linux-gnu\|--linux\|--freebsd[3-9]\|--freebsd[1-9][0-9]\| \
9	+ --dragonfly\|--openbsd\|--netbsd\|--gnu)
10	sharedcccompopts="-fPIC"
11	- mksharedlib="$bytecc -shared"
12	+ mksharedlib="$bytecc $bytecclinkopts -shared"
13	bytecclinkopts="$bytecclinkopts -Wl,-E"
14	byteccrpath="-Wl,-rpath,"
15	mksharedlibrpath="-Wl,-rpath,"
16	@@ -557,7 +558,7 @@ if test $withsharedlibs = "yes"; then
17	case "$bytecc" in
18	gcc*)
19	sharedcccompopts="-fPIC"
20	- mksharedlib="$bytecc -shared"
21	+ mksharedlib="$bytecc $bytecclinkopts -shared"
22	byteccrpath="-Wl,-rpath,"
23	mksharedlibrpath="-Wl,-rpath,"
24	shared_libraries_supported=true;;
25	@@ -573,11 +574,11 @@ if test $withsharedlibs = "yes"; then
26	gcc*)
27	sharedcccompopts="-fPIC"
28	if sh ./solaris-ld; then
29	- mksharedlib="$bytecc -shared"
30	+ mksharedlib="$bytecc $bytecclinkopts -shared"
31	byteccrpath="-R"
32	mksharedlibrpath="-R"
33	else
34	- mksharedlib="$bytecc -shared"
35	+ mksharedlib="$bytecc $bytecclinkopts -shared"
36	bytecclinkopts="$bytecclinkopts -Wl,-E"
37	natdynlinkopts="-Wl,-E"
38	byteccrpath="-Wl,-rpath,"
39	@@ -601,12 +602,12 @@ if test $withsharedlibs = "yes"; then
40	mksharedlibrpath="-rpath "
41	shared_libraries_supported=true;;
42	i[3456]86--darwin[89].)
43	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
44	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
45	bytecccompopts="$dl_defs $bytecccompopts"
46	dl_needs_underscore=false
47	shared_libraries_supported=true;;
48	-apple-darwin)
49	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
50	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
51	bytecccompopts="$dl_defs $bytecccompopts"
52	dl_needs_underscore=false
53	shared_libraries_supported=true;;
54	@@ -616,7 +617,7 @@ if test $withsharedlibs = "yes"; then
55	shared_libraries_supported=false;;
56	--openbsd*)
57	sharedcccompopts="-fPIC"
58	- mksharedlib="$bytecc -shared"
59	+ mksharedlib="$bytecc $bytecclinkopts -shared"
60	bytecclinkopts="$bytecclinkopts -Wl,-E"
61	natdynlinkopts="-Wl,-E"
62	byteccrpath="-Wl,-rpath,"
63	@@ -651,12 +652,16 @@ if test $withsharedlibs = "yes"; then
64	x86_64--kfreebsd) natdynlink=true;;
65	i[345]86--freebsd) natdynlink=true;;
66	x86_64--freebsd) natdynlink=true;;
67	+ i[345]86--dragonfly) natdynlink=true;;
68	+ x86_64--dragonfly) natdynlink=true;;
69	i[345]86--openbsd) natdynlink=true;;
70	x86_64--openbsd) natdynlink=true;;
71	i[345]86--netbsd) natdynlink=true;;
72	x86_64--netbsd) natdynlink=true;;
73	i386-*-gnu0.3) natdynlink=true;;
74	arm--linux*) natdynlink=true;;
75	+ arm--freebsd*) natdynlink=true;;
76	+ powerpc--freebsd*) natdynlink=true;;
77	esac
78	fi
79
80	@@ -680,6 +685,7 @@ case "$host" in
81	sparc--gnu*) arch=sparc; system=gnu;;
82	i[3456]86--linux) arch=i386; system=linux_`sh ./runtest elf.c`;;
83	i[3456]86--bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
84	+ i[3456]86--dragonfly) arch=i386; system=bsd_elf;;
85	i[3456]86--nextstep) arch=i386; system=nextstep;;
86	i[3456]86--solaris) if $arch64; then
87	arch=amd64; system=solaris
88	@@ -695,6 +701,7 @@ case "$host" in
89	fi;;
90	i[3456]86--gnu) arch=i386; system=gnu;;
91	powerpc--linux*) arch=power; model=ppc; system=elf;;
92	+ powerpc--freebsd*) arch=power; model=ppc; system=bsd_elf;;
93	powerpc--netbsd) arch=power; model=ppc; system=elf;;
94	powerpc--openbsd) arch=power; model=ppc; system=bsd_elf;;
95	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;
96	@@ -708,12 +715,14 @@ case "$host" in
97	armv5te--linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;;
98	armv5--linux-gnueabi) arch=arm; model=armv5; system=linux_eabi;;
99	arm--linux-gnueabi) arch=arm; system=linux_eabi;;
100	+ armv6--freebsd*) arch=arm; model=armv6; system=freebsd;;
101	x86_64--linux) arch=amd64; system=linux;;
102	x86_64--gnu) arch=amd64; system=gnu;;
103	x86_64--freebsd) arch=amd64; system=freebsd;;
104	x86_64--netbsd) arch=amd64; system=netbsd;;
105	x86_64--openbsd) arch=amd64; system=openbsd;;
106	x86_64--darwin) arch=amd64; system=macosx;;
107	+ x86_64--dragonfly) arch=amd64; system=dragonfly;;
108	esac
109
110	# Some platforms exist both in 32-bit and 64-bit variants, not distinguished
111	@@ -734,7 +743,7 @@ else
112	fi
113
114	nativecccompopts=''
115	-nativecclinkopts=''
116	+nativecclinkopts=""
117	# FIXME the naming of nativecclinkopts is broken: these are options for
118	# ld (for shared libs), not for cc
119	nativeccrpath="$byteccrpath"
120	@@ -766,6 +775,8 @@ case "$arch,$model,$system" in
121	aspp='gcc -m64 -c';;
122	amd64,,) as='as'
123	aspp='gcc -c';;
124	+ arm,,freebsd) as='cc -c';
125	+ aspp='cc -c';;
126	arm,,) as='as';
127	aspp='gcc -c';;
128	i386,*,solaris) as='as'
129	@@ -803,6 +814,8 @@ case "$arch,$model,$system" in
130	amd64,*,linux) profiling='prof';;
131	amd64,*,gnu) profiling='prof';;
132	arm,,linux) profiling='prof';;
133	+ ,,freebsd) profiling='prof';;
134	+ ,,dragonfly) profiling='prof';;
135	*) profiling='noprof';;
136	esac
137
138	@@ -1204,7 +1217,7 @@ if test "$pthread_wanted" = "yes"; then
139	case "$host" in
140	--solaris*) pthread_link="-lpthread -lposix4"
141	pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
142	- --freebsd*) pthread_link="-pthread"
143	+ --freebsd\|--dragonfly) pthread_link="-pthread"
144	pthread_caml_link="-cclib -pthread";;
145	--openbsd*) pthread_link="-pthread"
146	pthread_caml_link="-cclib -pthread";;
147	@@ -1218,7 +1231,7 @@ if test "$pthread_wanted" = "yes"; then
148	bytecccompopts="$bytecccompopts -D_REENTRANT"
149	nativecccompopts="$nativecccompopts -D_REENTRANT"
150	case "$host" in
151	- --freebsd*)
152	+ --freebsd\|--dragonfly)
153	bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
154	nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
155	--openbsd*)
156	@@ -1388,7 +1401,6 @@ if test "$x11_include" = "not found"; th
157	x11_libs="-L$dir"	5	x11_libs="-L$dir"
158	case "$host" in	6	case "$target" in
		7	+ --freebsd*) x11_link="-L$dir -lX11";;
159	-kfreebsd-gnu) x11_link="-L$dir -lX11";;	8	-kfreebsd-gnu) x11_link="-L$dir -lX11";;
160	- --bsd) x11_link="-R$dir -L$dir -lX11";;	9	--bsd) x11_link="-R$dir -L$dir -lX11";;
161	*) x11_link="-L$dir -lX11";;	10	*) x11_link="-L$dir -lX11";;
162	esac
163	fi
164	@@ -1514,7 +1526,7 @@ if test $has_tk = true; then
165	Tcl_DoOneEvent
166	then
167	case "$host" in
168	- --bsd) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
169	+ --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";;
170	*) tk_libs="-L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
171	esac
172	else
173	@@ -1528,14 +1540,14 @@ if test $has_tk = true; then
174	echo "Tcl/Tk libraries found."
175	elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
176	case "$host" in
177	- --bsd) tk_libs="-R/sw/lib -L/sw/lib $tk_libs";;
178	+ --bsd\|--dragonfly*) tk_libs="-R/sw/lib -L/sw/lib $tk_libs";;
179	*) tk_libs="-L/sw/lib $tk_libs";;
180	esac
181	echo "Tcl/Tk libraries found."
182	elif sh ./hasgot -L/usr/pkg/lib $tk_libs $tk_x11_libs $tkauxlibs \
183	Tk_SetGrid; then
184	case "$host" in
185	- --bsd) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs";;
186	+ --bsd\|--dragonfly*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs";;
187	*) tk_libs="-L/usr/pkg/lib $tk_libs";;
188	esac
189	echo "Tcl/Tk libraries found."
190	@@ -1564,10 +1576,10 @@ fi
191	# Look for BFD library
192
193	if ./hasgot -i bfd.h && \
194	- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
195	+ ./hasgot -lbfd $dllib -liberty -lz bfd_openr; then
196	echo "BFD library found."
197	echo "#define HAS_LIBBFD" >> s.h
198	- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
199	+ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
200	else
201	echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
202	echo "LIBBFD_LINK=" >> Makefile

Removed Link Here

(-)a/lang/ocaml/files/patch-ocamlbuild (-24 lines)
1	--- ocamlbuild/ocamlbuild_executor.ml.orig 2011-10-06 11:39:50.358159931 +0300
2	+++ ocamlbuild/ocamlbuild_executor.ml 2011-10-06 12:48:32.966029354 +0300
3	@@ -200,7 +200,11 @@
4	try
5	read fd u 0 (String.length u)
6	with
7	- \| Unix.Unix_error(_,_,_) -> 0
8	+ \| Unix.Unix_error(e,_,_) ->
9	+ let msg = error_message e in
10	+ display (fun oc -> fp oc
11	+ "Error while reading stdout/stderr: %s\n" msg);
12	+ 0
13	in
14	if m = 0 then
15	if job.job_dying then
16	@@ -236,6 +240,8 @@
17	(display begin fun oc -> fp oc "Terminating job %a\n%!" print_job_id job.job_id; end;)
18
19	decr jobs_active;
20	+ clear_nonblock (doi job.job_stdout);
21	+ clear_nonblock (doi job.job_stderr); (* we would get EAGAIN below otherwise *)
22	do_read ~loop:true (doi job.job_stdout) job;
23	do_read ~loop:true (doi job.job_stderr) job;
24	outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs);

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-Makefile.shared (-19 lines)
1	--- otherlibs/Makefile.shared.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/Makefile.shared 2014-04-01 07:24:57.000000000 +0200
3	@@ -59,14 +59,14 @@
4	install::
5	if test -f dll$(CLIBNAME)$(EXT_DLL); then \
6	cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
7	+ $(RANLIB) lib$(CLIBNAME).$(A)
8	cp lib$(CLIBNAME).$(A) $(LIBDIR)/
9	- cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
10	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
11	if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
12
13	installopt:
14	+ $(RANLIB) $(LIBNAME).a
15	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
16	- cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
17	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
18
19	partialclean:

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-dynlink-Makefile (-13 lines)
1	--- otherlibs/dynlink/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/dynlink/Makefile 2014-04-01 07:44:36.000000000 +0200
3	@@ -71,8 +71,8 @@
4
5	installopt:
6	if $(NATDYNLINK); then \
7	- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \
8	- cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \
9	+ $(RANLIB) dynlink.$(A); \
10	+ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR); \
11	fi
12
13	partialclean:

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile (-12 lines)
1	--- otherlibs/labltk/support/Makefile.orig 2012-07-17 17:31:12.000000000 +0200
2	+++ otherlibs/labltk/support/Makefile 2014-04-01 07:23:59.000000000 +0200
3	@@ -43,8 +43,8 @@
4
5	install:
6	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
7	+ $(RANLIB) lib$(LIBNAME).$(A)
8	cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
9	- cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
10	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
11	if test -f dll$(LIBNAME)$(EXT_DLL); then \
12	cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-systhreads-Makefile (-25 lines)
1	--- otherlibs/systhreads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/systhreads/Makefile 2014-04-01 07:26:11.000000000 +0200
3	@@ -71,8 +71,8 @@
4
5	install:
6	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
7	+ $(RANLIB) libthreads.a
8	cp libthreads.a $(LIBDIR)/libthreads.a
9	- cd $(LIBDIR); $(RANLIB) libthreads.a
10	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
11	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
12	rm -f $(LIBDIR)/threads/stdlib.cma
13	@@ -80,10 +80,10 @@
14	cp threads.h $(LIBDIR)/caml/threads.h
15
16	installopt:
17	+ $(RANLIB) libthreadsnat.a
18	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
19	- cd $(LIBDIR); $(RANLIB) libthreadsnat.a
20	+ $(RANLIB) threads.a
21	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads
22	- cd $(LIBDIR)/threads; $(RANLIB) threads.a
23
24	.SUFFIXES: .ml .mli .cmo .cmi .cmx
25

Removed Link Here

(-)a/lang/ocaml/files/patch-otherlibs-threads-Makefile (-12 lines)
1	--- otherlibs/threads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/threads/Makefile 2014-04-01 07:27:02.000000000 +0200
3	@@ -98,8 +98,8 @@
4	install:
5	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
6	mkdir -p $(LIBDIR)/vmthreads
7	+ $(RANLIB) libvmthreads.a
8	cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
9	- cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
10	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
11	threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
12	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \

Removed Link Here

(-)a/lang/ocaml/files/patch-stdlib-Makefile (-22 lines)
1	--- stdlib/Makefile.orig 2012-10-15 19:50:56.000000000 +0200
2	+++ stdlib/Makefile 2014-04-01 07:27:40.000000000 +0200
3	@@ -23,8 +23,8 @@
4	installopt: installopt-default installopt-$(PROFILING)
5
6	installopt-default:
7	+ $(RANLIB) stdlib.a
8	cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR)
9	- cd $(LIBDIR); $(RANLIB) stdlib.a
10
11	installopt-noprof:
12	rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa
13	@@ -34,8 +34,8 @@
14	rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
15
16	installopt-prof:
17	+ $(RANLIB) stdlib.p.a
18	cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
19	- cd $(LIBDIR); $(RANLIB) stdlib.p.a
20
21	stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
22	$(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)