Attachment #129383 for bug #173364




# Date created:		24 December 1996
# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD: ports/lang/ocaml/Makefile,v 1.77 2012/02/23 01:10:28 bf Exp $
#

PORTNAME=	ocaml
PORTVERSION=    4.00.1
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/pub/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_SITE_GENTOO}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
.if !defined(NOPORTDOCS)
DOCSDISTNAME=   ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
DISTFILES+= 	${DOCSDISTNAME}-refman-html.tar.gz \
		${DOCSDISTNAME}-refman.ps.gz \
		${DOCSDISTNAME}-refman.pdf
.endif


MASTER_SITE_SUBDIR=	distfiles
PKGNAMESUFFIX=	${SFX}


STRIP=
MAKE_JOBS_UNSAFE=	yes

CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
                -cc "${CC} ${CFLAGS}" \
                -as "${AS} ${ASFLAGS}" \
		-aspp "${CC} -c" \
                -partialld "${LD} -r"
OPTIONS=	X11	"Build with X11 support" on \
		TK	"Build LablTk library (requires X11 support)" on \
		THREADS	"Build with Posix threads support" on \
		CMP_LIB	"Install compiler's libraries" off \
		OPT_DEF	"Use system-optimized binaries by default" off

MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt


.include <bsd.port.pre.mk>

.if !defined(NOPORTDOCS)
PORTDOCS = htmlman/* ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
.endif

.if ${ARCH} == powerpc
ARCH=	power
.endif

.else
USE_TK=		84+
INVALID_TK_VER =	86
.if defined(WITH_THREADS)
USE_TK_THREADS =	yes
.endif
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
PLIST_SUB+=	TK=""
CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
CONFIGURE_ARGS+=	-tkdefs \
			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||}${_TCL_THREADS_SUFFIX} \
			-ltcl${TCL_VER:S|.||}${_TCL_THREADS_SUFFIX} ${THR_LD}"
.endif

.if ${ARCH} == sparc64

.if ${ARCH} == power
	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
.endif
.if !defined(NOPORTDOCS)
	@if ! (cd ${WRKDIR} && \
	  ${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \
	) \
	then \
	  exit 1; \
	fi;
.endif

post-patch:
	@${REINPLACE_CMD} \

		"! -name .cvsignore")
.endif

.if !defined(NOPORTSDOC)
	${MKDIR} ${DOCSDIR}
	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR})
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR}
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR}
.endif

.for PROG in camlp4o.opt camlp4of.opt camlp4oof.opt camlp4orf.opt \
	camlp4r.opt camlp4rf.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
	ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
	@${STRIP_CMD} ${PREFIX}/bin/${PROG}
.endfor

# Fix permissions for ld.conf
	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf

# Do we want to install documentation
.if !defined(NOPORTDOCS)

.endif
# Do we want .opt version of tools to be the default ?
.if defined(WITH_OPT_DEF)
. for module in ${MODOPT}

. endfor
.endif

# Add compiler's libs if required
.if defined(WITH_CMP_LIB)
	@${MKDIR}  ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/utils/*.cm* ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/parsing/*.cm* ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/parsing/*.o ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/typing/*.cm* ${PREFIX}/lib/ocaml/compiler-lib
	@${INSTALL_DATA} ${WRKSRC}/typing/*.o ${PREFIX}/lib/ocaml/compiler-lib
	@${FIND} ${PREFIX}/lib/ocaml/compiler-lib -type f | \
		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST}
.endif
	@${ECHO_CMD} "@unexec rmdir "%D/lib/ocaml" 2>/dev/null || true" >> ${TMPPLIST}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)b/ocaml/distinfo (-2 / +8 lines)
1	SHA256 (ocaml-3.12.1.tar.bz2) = edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d	1	SHA256 (ocaml-4.00.1.tar.bz2) = 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951
2	SIZE (ocaml-3.12.1.tar.bz2) = 2949124	2	SIZE (ocaml-4.00.1.tar.bz2) = 2762205
		3	SHA256 (ocaml-4.00-refman-html.tar.gz) = 8ca43859d8a71f0941a2453b7b808d7e58ad54804a9cf285875fa30e6576b31a
		4	SIZE (ocaml-4.00-refman-html.tar.gz) = 549757
		5	SHA256 (ocaml-4.00-refman.ps.gz) = 6146264fef7ae73f7ebb8dc49a3b1adae9d5bd4f9a14a2670c9d43f7e6a253c3
		6	SIZE (ocaml-4.00-refman.ps.gz) = 1075658
		7	SHA256 (ocaml-4.00-refman.pdf) = 76ba2cf60a605b2427f995563f6dc6c7dbb39be6b066f6d96b23926e8cc9babc
		8	SIZE (ocaml-4.00-refman.pdf) = 1453678

Added Link Here

(-)b/ocaml/files/edit_pkg-plist.sed (+6 lines)
1	/.p.cmx$/s@^@%%PROF%%@
2	/examples_labeltk/{
3	s@share/examples@%%EXAMPLESDIR%%@
4	s@^@%%TK%%@
5	}
6	/graphics/s@^@%%X11%%@




	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

Removed Link Here

(-)a/ocaml/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2010-06-16 03:32:26.000000000 +0200
2	+++ Makefile 2011-12-14 10:02:05.745076468 +0100
3	@@ -288,7 +288,7 @@
4	cp lex/ocamllex $(BINDIR)/ocamllex$(EXE)
5	cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
6	cp toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma
7	- cp expunge $(LIBDIR)/expunge$(EXE)
8	+ ${BSD_INSTALL_SCRIPT} expunge $(LIBDIR)/expunge$(EXE)
9	cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
10	cp toplevel/topstart.cmo $(LIBDIR)
11	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \

Added Link Here

(-)b/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	2012-11-01 17:14:55.000000000 +0100
+++ configure	2012-11-01 17:23:44.000000000 +0100
@@ -88,6 +88,8 @@
+++ configure	2012-01-15 20:29:30.319674803 +0000
@@ -85,6 +85,8 @@
         withcurses=no;;
     -no-shared-libs|--no-shared-libs)
         withsharedlibs=no;;
+    -no-x11|--no-x11)
+        x11_wanted=no;;
     -x11include*|--x11include*)
         x11_include_dir=$2; shift;;
     -x11lib*|--x11lib*)
@@ -537,7 +539,7 @@
       mksharedlib="$flexlink"
       mkmaindll="$flexlink -maindll"
       shared_libraries_supported=true;;

       sharedcccompopts="-fPIC"
       mksharedlib="$bytecc -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
@@ -687,6 +689,7 @@
                                 fi;;
   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
     i386-*-gnu0.3)                natdynlink=true;;
+    *-*-freebsd*)                 natdynlink=true;;
   esac
 fi
 
@@ -687,6 +690,7 @@
   hppa*-*-gnu*)                 arch=hppa; system=gnu;;
   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
+  powerpc-*-freebsd*)           arch=power; model=ppc; system=elf;;
   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
+  powerpc-*-freebsd*)           arch=power; model=ppc; system=bsd;;
   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
   powerpc-*-darwin*)            arch=power; system=rhapsody
@@ -786,6 +789,7 @@
   amd64,*,linux) profiling='prof';;
   amd64,*,gnu) profiling='prof';;
   arm,*,linux*) profiling='prof';;
   i386,*,macosx) profiling='prof';;
+  *,*,freebsd) profiling='prof';;
   *) profiling='noprof';;
 esac
     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
@@ -1256,133 +1261,24 @@
 x11_include="not found"
 x11_link="not found"
 
-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"
 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
 
 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=""
 else
   echo "Location of X11 include files: $x11_include/X11"
   echo "Options for linking with X11: $x11_link"
@@ -1509,7 +1405,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"




 
 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

Added Link Here

(-)b/ocaml/files/patch-testsuite-backtrace-Makefile (+11 lines)
1	--- testsuite/tests/backtrace/Makefile.orig 2012-11-01 20:28:23.000000000 +0100
2	+++ testsuite/tests/backtrace/Makefile 2012-11-01 20:28:30.000000000 +0100
3	@@ -6,7 +6,7 @@
4	$(OCAMLC) -g -o $(EXECNAME) $$file; \
5	for arg in a b c d ''; do \
6	printf " ... testing '$$file' (with argument '$$arg'):"; \
7	- OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg > `basename $$file ml`$$arg.result 2>&1; \
8	+ sh -c "OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg; true" > `basename $$file ml`$$arg.result 2>&1; \
9	$(DIFF) `basename $$file ml`$$arg.reference `basename $$file ml`$$arg.result > /dev/null && echo " => passed" \|\| (echo " => failed" && exit 1); \
10	done; \
11	done




bin/ocamlobjinfo
bin/camlp4
bin/camlp4boot
bin/camlp4o

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

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

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/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/compile.cmi
lib/ocaml/compiler-libs/compilenv.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/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/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/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
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
lib/ocaml/digest.mli
%%PROF%%lib/ocaml/digest.p.cmx
lib/ocaml/dynlink.a
lib/ocaml/dynlink.cmx
lib/ocaml/dynlink.cmxa
lib/ocaml/dynlink.cma
lib/ocaml/dynlink.cmi
lib/ocaml/dynlink.cmx
lib/ocaml/dynlink.cmxa
lib/ocaml/dynlink.mli
%%THREADS%%lib/ocaml/event.mli
lib/ocaml/expunge

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

lib/ocaml/obj.cmx
lib/ocaml/obj.ml
lib/ocaml/obj.mli
lib/ocaml/objinfo_helper
%%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/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

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

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

lib/ocaml/std_exit.cmx
lib/ocaml/std_exit.ml
lib/ocaml/std_exit.o
%%PROF%%lib/ocaml/std_exit.p.cmx
lib/ocaml/std_exit.p.o
lib/ocaml/stdlib.a
lib/ocaml/stdlib.cma

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

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

lib/ocaml/weak.ml
lib/ocaml/weak.mli
%%PROF%%lib/ocaml/weak.p.cmx
%%TK%%%%EXAMPLESDIR%%/examples_camltk/.ignore
%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile
%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt
%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml

%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml
%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml
%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml
%%TK%%%%EXAMPLESDIR%%/examples_labltk/.ignore
%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif
%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile
%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt

@dirrm lib/ocaml/ocamldoc
@dirrm lib/ocaml/ocamlbuild
%%TK%%@dirrmtry lib/ocaml/labltk
@dirrm lib/ocaml/compiler-libs
@dirrm lib/ocaml/camlp4/Camlp4Top
@dirrm lib/ocaml/camlp4/Camlp4Printers
@dirrm lib/ocaml/camlp4/Camlp4Parsers
@dirrm lib/ocaml/camlp4/Camlp4Filters
@dirrm lib/ocaml/camlp4
@dirrm lib/ocaml/caml
@dirrm lib/ocaml

Return to bug 173364

Lines 2-18 Link Here

(-)b/ocaml/Makefile (-28 / +49 lines)
2	# Date created: 24 December 1996	2	# Date created: 24 December 1996
3	# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>	3	# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
4	#	4	#
5	# $FreeBSD: Makefile 311776 2013-02-06 15:42:16Z gahr $	5	# $FreeBSD: ports/lang/ocaml/Makefile,v 1.77 2012/02/23 01:10:28 bf Exp $
6	#	6	#
7		7
8	PORTNAME= ocaml	8	PORTNAME= ocaml
9	PORTVERSION= 3.12.1	9	PORTVERSION= 4.00.1
10	PORTREVISION= 1
11	CATEGORIES= lang	10	CATEGORIES= lang
12	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \	11	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
13	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
14	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME:R}/ \
15	${MASTER_SITE_GENTOO}	12	${MASTER_SITE_GENTOO}
		13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
		15	.if !defined(NOPORTDOCS)
		16	DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
		17	DISTFILES+= ${DOCSDISTNAME}-refman-html.tar.gz \
		18	${DOCSDISTNAME}-refman.ps.gz \
		19	${DOCSDISTNAME}-refman.pdf
		20	.endif
		21
		22
16	MASTER_SITE_SUBDIR= distfiles	23	MASTER_SITE_SUBDIR= distfiles
17	PKGNAMESUFFIX= ${SFX}	24	PKGNAMESUFFIX= ${SFX}
18		25
Lines 26-37 ALL_TARGET= world.opt Link Here
26	STRIP=	33	STRIP=
27	MAKE_JOBS_UNSAFE= yes	34	MAKE_JOBS_UNSAFE= yes
28		35
29	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" -cc "${CC}" -as "${AS}" \	36	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \
30	-aspp "${CC} -c" -partialld "${LD} -r"	37	-cc "${CC} ${CFLAGS}" \
		38	-as "${AS} ${ASFLAGS}" \
		39	-aspp "${CC} -c" \
		40	-partialld "${LD} -r"
31	OPTIONS= X11 "Build with X11 support" on \	41	OPTIONS= X11 "Build with X11 support" on \
32	TK "Build LablTk library (requires X11 support)" on \	42	TK "Build LablTk library (requires X11 support)" on \
33	THREADS "Build with Posix threads support" on \	43	THREADS "Build with Posix threads support" on \
34	CMP_LIB "Install compiler's libraries" off \
35	OPT_DEF "Use system-optimized binaries by default" off	44	OPT_DEF "Use system-optimized binaries by default" off
36		45
37	MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt	46	MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
Lines 39-44 PATTERN= [[:space:]](do\|then)?[[:space:]])(\$$\(CP\)\|cp)([[:space:]] Link Here
39		48
40	.include <bsd.port.pre.mk>	49	.include <bsd.port.pre.mk>
41		50
		51	.if !defined(NOPORTDOCS)
		52	PORTDOCS = htmlman/* ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
		53	.endif
		54
42	.if ${ARCH} == powerpc	55	.if ${ARCH} == powerpc
43	ARCH= power	56	ARCH= power
44	.endif	57	.endif
Lines 84-96 CONFIGURE_ARGS+=-no-tk Link Here
84	.else	97	.else
85	USE_TK= 84+	98	USE_TK= 84+
86	INVALID_TK_VER = 86	99	INVALID_TK_VER = 86
		100	.if defined(WITH_THREADS)
		101	USE_TK_THREADS = yes
		102	.endif
87	.include "${PORTSDIR}/Mk/bsd.tcl.mk"	103	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
88	PLIST_SUB+= TK=""	104	PLIST_SUB+= TK=""
89	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*	105	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
90	CONFIGURE_ARGS+= -tkdefs \	106	CONFIGURE_ARGS+= -tkdefs \
91	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \	107	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
92	-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S\|.\|\|} \	108	-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S\|.\|\|}${_TCL_THREADS_SUFFIX} \
93	-ltcl${TCL_VER:S\|.\|\|} ${THR_LD}"	109	-ltcl${TCL_VER:S\|.\|\|}${_TCL_THREADS_SUFFIX} ${THR_LD}"
94	.endif	110	.endif
95		111
96	.if ${ARCH} == sparc64	112	.if ${ARCH} == sparc64
Lines 101-106 post-extract: Link Here
101	.if ${ARCH} == power	117	.if ${ARCH} == power
102	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S	118	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
103	.endif	119	.endif
		120	.if !defined(NOPORTDOCS)
		121	@if ! (cd ${WRKDIR} && \
		122	${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \
		123	) \
		124	then \
		125	exit 1; \
		126	fi;
		127	.endif
104		128
105	post-patch:	129	post-patch:
106	@${REINPLACE_CMD} \	130	@${REINPLACE_CMD} \
Lines 155-168 post-install: Link Here
155	"! -name .cvsignore")	179	"! -name .cvsignore")
156	.endif	180	.endif
157		181
158	.for PROG in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \	182	.if !defined(NOPORTSDOC)
159	ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc	183	${MKDIR} ${DOCSDIR}
		184	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR})
		185	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR}
		186	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR}
		187	.endif
		188
		189	.for PROG in camlp4o.opt camlp4of.opt camlp4oof.opt camlp4orf.opt \
		190	camlp4r.opt camlp4rf.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
		191	ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
160	@${STRIP_CMD} ${PREFIX}/bin/${PROG}	192	@${STRIP_CMD} ${PREFIX}/bin/${PROG}
161	.endfor	193	.endfor
162		194
163	# Fix permissions for ld.conf	195	# Fix permissions for ld.conf
164	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf	196	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf
165		197
		198	# Do we want to install documentation
		199	.if !defined(NOPORTDOCS)
		200
		201	.endif
166	# Do we want .opt version of tools to be the default ?	202	# Do we want .opt version of tools to be the default ?
167	.if defined(WITH_OPT_DEF)	203	.if defined(WITH_OPT_DEF)
168	. for module in ${MODOPT}	204	. for module in ${MODOPT}
Lines 176-194 post-install: Link Here
176	. endfor	212	. endfor
177	.endif	213	.endif
178		214
179	# Add compiler's libs if required
180	.if defined(WITH_CMP_LIB)
181	@${MKDIR} ${PREFIX}/lib/ocaml/compiler-lib
182	@${INSTALL_DATA} ${WRKSRC}/utils/.cm ${PREFIX}/lib/ocaml/compiler-lib
183	@${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib
184	@${INSTALL_DATA} ${WRKSRC}/parsing/.cm ${PREFIX}/lib/ocaml/compiler-lib
185	@${INSTALL_DATA} ${WRKSRC}/parsing/*.o ${PREFIX}/lib/ocaml/compiler-lib
186	@${INSTALL_DATA} ${WRKSRC}/typing/.cm ${PREFIX}/lib/ocaml/compiler-lib
187	@${INSTALL_DATA} ${WRKSRC}/typing/*.o ${PREFIX}/lib/ocaml/compiler-lib
188	@${FIND} ${PREFIX}/lib/ocaml/compiler-lib -type f \| \
189	${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
190	@${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST}
191	.endif
192	@${ECHO_CMD} "@unexec rmdir "%D/lib/ocaml" 2>/dev/null \|\| true" >> ${TMPPLIST}
193
194	.include <bsd.port.post.mk>	215	.include <bsd.port.post.mk>

Lines 8-98 MAN1= ocaml.1 \ Link Here

(-)b/ocaml/files/manfiles (-82 / +85 lines)
8	ocamllex.1 \	8	ocamllex.1 \
9	ocamlmktop.1 \	9	ocamlmktop.1 \
10	ocamlopt.1 \	10	ocamlopt.1 \
		11	ocamloptp.1 \
11	ocamlprof.1 \	12	ocamlprof.1 \
12	ocamlrun.1 \	13	ocamlrun.1 \
13	ocamlyacc.1	14	ocamlyacc.1
14		15
15	MANN= Arg.n \	16	MANN= Arg.3o \
16	Array.n \	17	Array.3o \
17	ArrayLabels.n \	18	ArrayLabels.3o \
18	Bigarray.Array1.n \	19	Bigarray.3o \
19	Bigarray.Array2.n \	20	Bigarray.Array1.3o \
20	Bigarray.Array3.n \	21	Bigarray.Array2.3o \
21	Bigarray.Genarray.n \	22	Bigarray.Array3.3o \
22	Bigarray.n \	23	Bigarray.Genarray.3o \
23	Buffer.n \	24	Buffer.3o \
24	Callback.n \	25	Callback.3o \
25	CamlinternalOO.n \	26	CamlinternalLazy.3o \
26	CamlinternalLazy.n \	27	CamlinternalMod.3o \
27	CamlinternalMod.n \	28	CamlinternalOO.3o \
28	Char.n \	29	Complex.3o \
29	Complex.n \	30	Digest.3o \
30	Digest.n \	31	Filename.3o \
31	Filename.n \	32	Format.3o \
32	Format.n \	33	Gc.3o \
33	Gc.n \	34	Genlex.3o \
34	Genlex.n \	35	Hashtbl.3o \
35	Hashtbl.HashedType.n \	36	Hashtbl.HashedType.3o \
36	Hashtbl.Make.n \	37	Hashtbl.Make.3o \
37	Hashtbl.S.n \	38	Hashtbl.MakeSeeded.3o \
38	Hashtbl.n \	39	Hashtbl.S.3o \
39	Int32.n \	40	Hashtbl.SeededHashedType.3o \
40	Int64.n \	41	Hashtbl.SeededS.3o \
41	Lazy.n \	42	Int32.3o \
42	Lexing.n \	43	Int64.3o \
43	List.n \	44	Lexing.3o \
44	ListLabels.n \	45	List.3o \
45	Map.Make.n \	46	ListLabels.3o \
46	Map.OrderedType.n \	47	Map.3o \
47	Map.S.n \	48	Map.Make.3o \
48	Map.n \	49	Map.OrderedType.3o \
49	Marshal.n \	50	Map.S.3o \
50	MoreLabels.Hashtbl.HashedType.n \	51	Marshal.3o \
51	MoreLabels.Hashtbl.Make.n \	52	MoreLabels.3o \
52	MoreLabels.Hashtbl.S.n \	53	MoreLabels.Hashtbl.3o \
53	MoreLabels.Hashtbl.n \	54	MoreLabels.Hashtbl.HashedType.3o \
54	MoreLabels.Map.Make.n \	55	MoreLabels.Hashtbl.Make.3o \
55	MoreLabels.Map.OrderedType.n \	56	MoreLabels.Hashtbl.MakeSeeded.3o \
56	MoreLabels.Map.S.n \	57	MoreLabels.Hashtbl.S.3o \
57	MoreLabels.Map.n \	58	MoreLabels.Hashtbl.SeededHashedType.3o \
58	MoreLabels.Set.Make.n \	59	MoreLabels.Hashtbl.SeededS.3o \
59	MoreLabels.Set.OrderedType.n \	60	MoreLabels.Map.3o \
60	MoreLabels.Set.S.n \	61	MoreLabels.Map.Make.3o \
61	MoreLabels.Set.n \	62	MoreLabels.Map.OrderedType.3o \
62	MoreLabels.n \	63	MoreLabels.Map.S.3o \
63	Nativeint.n \	64	MoreLabels.Set.3o \
64	Num.n \	65	MoreLabels.Set.Make.3o \
65	Obj.n \	66	MoreLabels.Set.OrderedType.3o \
66	Oo.n \	67	MoreLabels.Set.S.3o \
67	Parsing.n \	68	Nativeint.3o \
68	Pervasives.LargeFile.n \	69	Num.3o \
69	Pervasives.n \	70	Obj.3o \
70	Printexc.n \	71	Oo.3o \
71	Printf.n \	72	Parsing.3o \
72	Queue.n \	73	Pervasives.3o \
73	Random.n \	74	Pervasives.LargeFile.3o \
74	Random.State.n \	75	Printexc.3o \
75	Scanf.Scanning.n \	76	Printf.3o \
76	Scanf.n \	77	Queue.3o \
77	Set.Make.n \	78	Random.3o \
78	Set.OrderedType.n \	79	Random.State.3o \
79	Set.S.n \	80	Scanf.3o \
80	Set.n \	81	Scanf.Scanning.3o \
81	Sort.n \	82	Set.Make.3o \
82	Stack.n \	83	Set.OrderedType.3o \
83	StdLabels.Array.n \	84	Set.S.3o \
84	StdLabels.List.n \	85	Sort.3o \
85	StdLabels.String.n \	86	Stack.3o \
86	StdLabels.n \	87	StdLabels.3o \
87	Str.n \	88	StdLabels.Array.3o \
88	Stream.n \	89	StdLabels.List.3o \
89	String.n \	90	StdLabels.String.3o \
90	StringLabels.n \	91	Str.3o \
91	Sys.n \	92	Stream.3o \
92	Unix.LargeFile.n \	93	StringLabels.3o \
93	Unix.n \	94	Sys.3o \
94	Weak.Make.n \	95	Unix.3o \
95	Weak.S.n \	96	Unix.LargeFile.3o \
96	Weak.n	97	Weak.3o \
		98	Weak.Make.3o \
		99	Weak.S.3o
97		100
98	MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1	101	MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1

Lines 1-17 Link Here

(-)b/ocaml/files/patch-configure (-179 / +15 lines)
1	$FreeBSD: files/patch-configure 300896 2012-07-14 13:54:48Z beat $	1	--- configure.orig 2012-11-01 17:14:55.000000000 +0100
2		2	+++ configure 2012-11-01 17:23:44.000000000 +0100
3	--- configure.orig 2011-07-04 22:15:01.000000000 +0100	3	@@ -88,6 +88,8 @@
4	+++ configure 2012-01-15 20:29:30.319674803 +0000
5	@@ -85,6 +85,8 @@
6	withcurses=no;;	4	withcurses=no;;
7	-no-shared-libs)	5	-no-shared-libs\|--no-shared-libs)
8	withsharedlibs=no;;	6	withsharedlibs=no;;
9	+ -no-x11\|--no-x11)	7	+ -no-x11\|--no-x11)
10	+ x11_wanted=no;;	8	+ x11_wanted=no;;
11	-x11include\|--x11include)	9	-x11include\|--x11include)
12	x11_include_dir=$2; shift;;	10	x11_include_dir=$2; shift;;
13	-x11lib\|--x11lib)	11	-x11lib\|--x11lib)
14	@@ -521,7 +523,7 @@	12	@@ -537,7 +539,7 @@
15	mksharedlib="$flexlink"	13	mksharedlib="$flexlink"
16	mkmaindll="$flexlink -maindll"	14	mkmaindll="$flexlink -maindll"
17	shared_libraries_supported=true;;	15	shared_libraries_supported=true;;
Lines 20-200 $FreeBSD: files/patch-configure 300896 2012-07-14 13:54:48Z beat $ Link Here
20	sharedcccompopts="-fPIC"	18	sharedcccompopts="-fPIC"
21	mksharedlib="$bytecc -shared"	19	mksharedlib="$bytecc -shared"
22	bytecclinkopts="$bytecclinkopts -Wl,-E"	20	bytecclinkopts="$bytecclinkopts -Wl,-E"
23	@@ -636,6 +638,7 @@	21	@@ -687,6 +689,7 @@
24	i[345]86--netbsd) natdynlink=true;;	22	fi;;
25	x86_64--netbsd) natdynlink=true;;	23	i[3456]86--gnu) arch=i386; system=gnu;;
26	i386-*-gnu0.3) natdynlink=true;;
27	+ --freebsd*) natdynlink=true;;
28	esac
29	fi
30
31	@@ -687,6 +690,7 @@
32	hppa--gnu*) arch=hppa; system=gnu;;
33	powerpc--linux*) arch=power; model=ppc; system=elf;;	24	powerpc--linux*) arch=power; model=ppc; system=elf;;
		25	+ powerpc--freebsd) arch=power; model=ppc; system=elf;;
34	powerpc--netbsd) arch=power; model=ppc; system=elf;;	26	powerpc--netbsd) arch=power; model=ppc; system=elf;;
35	+ powerpc--freebsd) arch=power; model=ppc; system=bsd;;
36	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;	27	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;
37	powerpc--darwin) arch=power; system=rhapsody	28	powerpc--darwin) arch=power; system=rhapsody
38	if $arch64; then model=ppc64; else model=ppc; fi;;	29	@@ -786,6 +789,7 @@
39	@@ -796,6 +800,7 @@	30	amd64,*,linux) profiling='prof';;
40	i386,*,bsd_elf) profiling='prof';;	31	amd64,*,gnu) profiling='prof';;
41	amd64,*,macosx) profiling='prof';;	32	arm,,linux) profiling='prof';;
42	i386,*,macosx) profiling='prof';;
43	+ ,,freebsd) profiling='prof';;	33	+ ,,freebsd) profiling='prof';;
44	sparc,*,solaris)	34	*) profiling='noprof';;
45	profiling='prof'	35	esac
46	case "$nativecc" in gcc) ;; ) cc_profile='-xpg';; esac;;
47	@@ -1256,133 +1261,24 @@
48	x11_include="not found"
49	x11_link="not found"
50
51	-for dir in \
52	- $x11_include_dir \
53	- \
54	- /usr/X11R7/include \
55	- /usr/include/X11R7 \
56	- /usr/local/X11R7/include \
57	- /usr/local/include/X11R7 \
58	- /opt/X11R7/include \
59	- \
60	- /usr/X11R6/include \
61	- /usr/include/X11R6 \
62	- /usr/local/X11R6/include \
63	- /usr/local/include/X11R6 \
64	- /opt/X11R6/include \
65	- \
66	- /usr/X11/include \
67	- /usr/include/X11 \
68	- /usr/local/X11/include \
69	- /usr/local/include/X11 \
70	- /opt/X11/include \
71	- \
72	- /usr/X11R5/include \
73	- /usr/include/X11R5 \
74	- /usr/local/X11R5/include \
75	- /usr/local/include/X11R5 \
76	- /usr/local/x11r5/include \
77	- /opt/X11R5/include \
78	- \
79	- /usr/X11R4/include \
80	- /usr/include/X11R4 \
81	- /usr/local/X11R4/include \
82	- /usr/local/include/X11R4 \
83	- \
84	- /usr/X386/include \
85	- /usr/x386/include \
86	- /usr/XFree86/include/X11 \
87	- \
88	- /usr/include \
89	- /usr/local/include \
90	- /usr/unsupported/include \
91	- /usr/athena/include \
92	- /usr/lpp/Xamples/include \
93	- \
94	- /usr/openwin/include \
95	- /usr/openwin/share/include \
96	- ; \
97	-do
98	- if test -f $dir/X11/X.h; then
99	- x11_include=$dir
100	- break
101	- fi
102	-done
103	-
104	-if test "$x11_include" = "not found"; then
105	- x11_try_lib_dir=''
106	-else
107	- x11_try_lib_dir=`echo $x11_include \| sed -e 's\|include\|lib\|'`
108	+if [ -n "$x11_include_dir" ]; then
109	+ x11_include="$x11_include_dir"
110	fi
111
112	-for dir in \
113	- $x11_lib_dir \
114	- $x11_try_lib_dir \
115	- \
116	- /usr/X11R6/lib64 \
117	- /usr/X11R6/lib \
118	- /usr/lib/X11R6 \
119	- /usr/local/X11R6/lib \
120	- /usr/local/lib/X11R6 \
121	- /opt/X11R6/lib \
122	- \
123	- /usr/X11/lib \
124	- /usr/lib/X11 \
125	- /usr/local/X11/lib \
126	- /usr/local/lib/X11 \
127	- /opt/X11/lib \
128	- \
129	- /usr/X11R5/lib \
130	- /usr/lib/X11R5 \
131	- /usr/local/X11R5/lib \
132	- /usr/local/lib/X11R5 \
133	- /usr/local/x11r5/lib \
134	- /opt/X11R5/lib \
135	- \
136	- /usr/X11R4/lib \
137	- /usr/lib/X11R4 \
138	- /usr/local/X11R4/lib \
139	- /usr/local/lib/X11R4 \
140	- \
141	- /usr/X386/lib \
142	- /usr/x386/lib \
143	- /usr/XFree86/lib/X11 \
144	- \
145	- /usr/lib64 \
146	- /usr/lib \
147	- /usr/local/lib \
148	- /usr/unsupported/lib \
149	- /usr/athena/lib \
150	- /usr/lpp/Xamples/lib \
151	- /lib/usr/lib/X11 \
152	- \
153	- /usr/openwin/lib \
154	- /usr/openwin/share/lib \
155	- ; \
156	-do
157	- if test -f $dir/libX11.a \|\| \
158	- test -f $dir/libX11.so \|\| \
159	- test -f $dir/libX11.dll.a \|\| \
160	- test -f $dir/libX11.dylib \|\| \
161	- test -f $dir/libX11.sa; then
162	- if test $dir = /usr/lib; then
163	- x11_link="-lX11"
164	- else
165	- x11_libs="-L$dir"
166	- case "$host" in
167	- --bsd) x11_link="-R$dir -L$dir -lX11";;
168	- *) x11_link="-L$dir -lX11";;
169	- esac
170	- fi
171	- break
172	- fi
173	-done
174	-
175	+if [ -n "$x11_lib_dir" ]; then
176	+ x11_link="-L$x11_lib_dir -lX11"
177	+ x11_libs="-L$x11_lib_dir"
178	+fi
179		36
180	if test "$x11_include" = "not found" \|\| test "$x11_link" = "not found"
181	then
182	echo "X11 not found, the \"graph\" library will not be supported."
183	x11_include=""
184	+elif test "$x11_wanted" = "no"
185	+then
186	+ echo "X11 support was disabled, the \"graph\" library will not be supported."
187	+ x11_include=""
188	+ x11_link=""
189	else
190	echo "Location of X11 include files: $x11_include/X11"
191	echo "Options for linking with X11: $x11_link"
192	@@ -1509,7 +1405,7 @@
193	then tk_libs="$tk_libs $dllib"
194	elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
195	then
196	- tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
197	+ tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj.$tclmin $dllib"
198	elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
199	then
200	tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"

Lines 9-24 Link Here

(-)b/ocaml/files/patch-ocamldoc_Makefile (-13 lines)
9		9
10	INSTALL_MLIS=odoc_info.mli	10	INSTALL_MLIS=odoc_info.mli
11	INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)	11	INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
12	@@ -265,7 +265,11 @@
13	$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
14	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
15	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
16	- if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
17	+ if test -d stdlib_man; then \
18	+ for f in stdlib_man/*; do \
19	+ $(BSD_INSTALL_MAN) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
20	+ done; \
21	+ fi
22
23	installopt:
24	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi

Lines 1-4 Link Here

(-)b/ocaml/pkg-plist (-22 / +152 lines)
1	bin/ocamlobjinfo
2	bin/camlp4	1	bin/camlp4
3	bin/camlp4boot	2	bin/camlp4boot
4	bin/camlp4o	3	bin/camlp4o
Lines 33-44 bin/ocamllex Link Here
33	bin/ocamllex.opt	32	bin/ocamllex.opt
34	bin/ocamlmklib	33	bin/ocamlmklib
35	bin/ocamlmktop	34	bin/ocamlmktop
		35	bin/ocamlobjinfo
36	bin/ocamlopt	36	bin/ocamlopt
37	bin/ocamlopt.opt	37	bin/ocamlopt.opt
		38	bin/ocamloptp
38	bin/ocamlprof	39	bin/ocamlprof
39	bin/ocamlrun	40	bin/ocamlrun
40	bin/ocamlyacc	41	bin/ocamlyacc
41	lib/ocaml/Makefile.config	42	lib/ocaml/Makefile.config
		43	lib/ocaml/VERSION
42	lib/ocaml/arg.cmi	44	lib/ocaml/arg.cmi
43	lib/ocaml/arg.cmx	45	lib/ocaml/arg.cmx
44	lib/ocaml/arg.ml	46	lib/ocaml/arg.ml
Lines 85-90 lib/ocaml/caml/compatibility.h Link Here
85	lib/ocaml/caml/config.h	87	lib/ocaml/caml/config.h
86	lib/ocaml/caml/custom.h	88	lib/ocaml/caml/custom.h
87	lib/ocaml/caml/fail.h	89	lib/ocaml/caml/fail.h
		90	lib/ocaml/caml/hash.h
88	lib/ocaml/caml/intext.h	91	lib/ocaml/caml/intext.h
89	lib/ocaml/caml/memory.h	92	lib/ocaml/caml/memory.h
90	lib/ocaml/caml/misc.h	93	lib/ocaml/caml/misc.h
Lines 261-289 lib/ocaml/char.cmx Link Here
261	lib/ocaml/char.ml	264	lib/ocaml/char.ml
262	lib/ocaml/char.mli	265	lib/ocaml/char.mli
263	%%PROF%%lib/ocaml/char.p.cmx	266	%%PROF%%lib/ocaml/char.p.cmx
		267	lib/ocaml/compiler-libs/annot.cmi
		268	lib/ocaml/compiler-libs/arch.cmi
		269	lib/ocaml/compiler-libs/asmgen.cmi
		270	lib/ocaml/compiler-libs/asmlibrarian.cmi
		271	lib/ocaml/compiler-libs/asmlink.cmi
		272	lib/ocaml/compiler-libs/asmpackager.cmi
		273	lib/ocaml/compiler-libs/asttypes.cmi
		274	lib/ocaml/compiler-libs/btype.cmi
		275	lib/ocaml/compiler-libs/bytegen.cmi
		276	lib/ocaml/compiler-libs/bytelibrarian.cmi
		277	lib/ocaml/compiler-libs/bytelink.cmi
		278	lib/ocaml/compiler-libs/bytepackager.cmi
		279	lib/ocaml/compiler-libs/bytesections.cmi
		280	lib/ocaml/compiler-libs/ccomp.cmi
		281	lib/ocaml/compiler-libs/clambda.cmi
		282	lib/ocaml/compiler-libs/clflags.cmi
		283	lib/ocaml/compiler-libs/closure.cmi
		284	lib/ocaml/compiler-libs/cmi_format.cmi
		285	lib/ocaml/compiler-libs/cmm.cmi
		286	lib/ocaml/compiler-libs/cmmgen.cmi
		287	lib/ocaml/compiler-libs/cmo_format.cmi
		288	lib/ocaml/compiler-libs/cmt_format.cmi
		289	lib/ocaml/compiler-libs/cmx_format.cmi
		290	lib/ocaml/compiler-libs/coloring.cmi
		291	lib/ocaml/compiler-libs/comballoc.cmi
		292	lib/ocaml/compiler-libs/compile.cmi
		293	lib/ocaml/compiler-libs/compilenv.cmi
		294	lib/ocaml/compiler-libs/config.cmi
		295	lib/ocaml/compiler-libs/consistbl.cmi
		296	lib/ocaml/compiler-libs/ctype.cmi
		297	lib/ocaml/compiler-libs/datarepr.cmi
		298	lib/ocaml/compiler-libs/debuginfo.cmi
		299	lib/ocaml/compiler-libs/dll.cmi
		300	lib/ocaml/compiler-libs/emit.cmi
		301	lib/ocaml/compiler-libs/emitaux.cmi
		302	lib/ocaml/compiler-libs/emitcode.cmi
		303	lib/ocaml/compiler-libs/env.cmi
		304	lib/ocaml/compiler-libs/errors.cmi
		305	lib/ocaml/compiler-libs/expunge.cmi
		306	lib/ocaml/compiler-libs/genprintval.cmi
		307	lib/ocaml/compiler-libs/ident.cmi
		308	lib/ocaml/compiler-libs/includeclass.cmi
		309	lib/ocaml/compiler-libs/includecore.cmi
		310	lib/ocaml/compiler-libs/includemod.cmi
		311	lib/ocaml/compiler-libs/instruct.cmi
		312	lib/ocaml/compiler-libs/interf.cmi
		313	lib/ocaml/compiler-libs/lambda.cmi
		314	lib/ocaml/compiler-libs/lexer.cmi
		315	lib/ocaml/compiler-libs/linearize.cmi
		316	lib/ocaml/compiler-libs/liveness.cmi
		317	lib/ocaml/compiler-libs/location.cmi
		318	lib/ocaml/compiler-libs/longident.cmi
		319	lib/ocaml/compiler-libs/mach.cmi
		320	lib/ocaml/compiler-libs/main.cmi
		321	lib/ocaml/compiler-libs/main.cmo
		322	lib/ocaml/compiler-libs/main.cmx
		323	lib/ocaml/compiler-libs/main.o
		324	lib/ocaml/compiler-libs/main_args.cmi
		325	lib/ocaml/compiler-libs/matching.cmi
		326	lib/ocaml/compiler-libs/meta.cmi
		327	lib/ocaml/compiler-libs/misc.cmi
		328	lib/ocaml/compiler-libs/mtype.cmi
		329	lib/ocaml/compiler-libs/ocamlbytecomp.a
		330	lib/ocaml/compiler-libs/ocamlbytecomp.cma
331	lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
332	lib/ocaml/compiler-libs/ocamlcommon.a
333	lib/ocaml/compiler-libs/ocamlcommon.cma
334	lib/ocaml/compiler-libs/ocamlcommon.cmxa
335	lib/ocaml/compiler-libs/ocamloptcomp.a
336	lib/ocaml/compiler-libs/ocamloptcomp.cma
337	lib/ocaml/compiler-libs/ocamloptcomp.cmxa
338	lib/ocaml/compiler-libs/ocamltoplevel.cma
339	lib/ocaml/compiler-libs/opcodes.cmi
340	lib/ocaml/compiler-libs/oprint.cmi
341	lib/ocaml/compiler-libs/optcompile.cmi
342	lib/ocaml/compiler-libs/opterrors.cmi
343	lib/ocaml/compiler-libs/optmain.cmi
344	lib/ocaml/compiler-libs/optmain.cmo
345	lib/ocaml/compiler-libs/optmain.cmx
346	lib/ocaml/compiler-libs/optmain.o
347	lib/ocaml/compiler-libs/outcometree.cmi
348	lib/ocaml/compiler-libs/parmatch.cmi
349	lib/ocaml/compiler-libs/parse.cmi
350	lib/ocaml/compiler-libs/parser.cmi
351	lib/ocaml/compiler-libs/parsetree.cmi
352	lib/ocaml/compiler-libs/path.cmi
353	lib/ocaml/compiler-libs/pparse.cmi
354	lib/ocaml/compiler-libs/predef.cmi
355	lib/ocaml/compiler-libs/primitive.cmi
356	lib/ocaml/compiler-libs/printast.cmi
357	lib/ocaml/compiler-libs/printclambda.cmi
358	lib/ocaml/compiler-libs/printcmm.cmi
359	lib/ocaml/compiler-libs/printinstr.cmi
360	lib/ocaml/compiler-libs/printlambda.cmi
361	lib/ocaml/compiler-libs/printlinear.cmi
362	lib/ocaml/compiler-libs/printmach.cmi
363	lib/ocaml/compiler-libs/printtyp.cmi
364	lib/ocaml/compiler-libs/printtyped.cmi
365	lib/ocaml/compiler-libs/proc.cmi
366	lib/ocaml/compiler-libs/reg.cmi
367	lib/ocaml/compiler-libs/reload.cmi
368	lib/ocaml/compiler-libs/reloadgen.cmi
369	lib/ocaml/compiler-libs/runtimedef.cmi
370	lib/ocaml/compiler-libs/schedgen.cmi
371	lib/ocaml/compiler-libs/scheduling.cmi
372	lib/ocaml/compiler-libs/selectgen.cmi
373	lib/ocaml/compiler-libs/selection.cmi
374	lib/ocaml/compiler-libs/simplif.cmi
375	lib/ocaml/compiler-libs/spill.cmi
376	lib/ocaml/compiler-libs/split.cmi
377	lib/ocaml/compiler-libs/stypes.cmi
378	lib/ocaml/compiler-libs/subst.cmi
379	lib/ocaml/compiler-libs/switch.cmi
380	lib/ocaml/compiler-libs/symtable.cmi
381	lib/ocaml/compiler-libs/syntaxerr.cmi
382	lib/ocaml/compiler-libs/tbl.cmi
383	lib/ocaml/compiler-libs/terminfo.cmi
384	lib/ocaml/compiler-libs/topdirs.cmi
385	lib/ocaml/compiler-libs/toploop.cmi
386	lib/ocaml/compiler-libs/topmain.cmi
387	lib/ocaml/compiler-libs/topstart.cmi
388	lib/ocaml/compiler-libs/topstart.cmo
389	lib/ocaml/compiler-libs/trace.cmi
390	lib/ocaml/compiler-libs/translclass.cmi
391	lib/ocaml/compiler-libs/translcore.cmi
392	lib/ocaml/compiler-libs/translmod.cmi
393	lib/ocaml/compiler-libs/translobj.cmi
394	lib/ocaml/compiler-libs/typeclass.cmi
395	lib/ocaml/compiler-libs/typecore.cmi
396	lib/ocaml/compiler-libs/typedecl.cmi
397	lib/ocaml/compiler-libs/typedtree.cmi
398	lib/ocaml/compiler-libs/typemod.cmi
399	lib/ocaml/compiler-libs/typeopt.cmi
400	lib/ocaml/compiler-libs/types.cmi
401	lib/ocaml/compiler-libs/typetexp.cmi
402	lib/ocaml/compiler-libs/warnings.cmi
264	lib/ocaml/complex.cmi	403	lib/ocaml/complex.cmi
265	lib/ocaml/complex.cmx	404	lib/ocaml/complex.cmx
266	lib/ocaml/complex.ml	405	lib/ocaml/complex.ml
267	lib/ocaml/complex.mli	406	lib/ocaml/complex.mli
268	%%PROF%%lib/ocaml/complex.p.cmx	407	%%PROF%%lib/ocaml/complex.p.cmx
269	%%THREADS%%lib/ocaml/condition.mli	408	%%THREADS%%lib/ocaml/condition.mli
270	lib/ocaml/dbm.a
271	lib/ocaml/dbm.cma
272	lib/ocaml/dbm.cmi
273	lib/ocaml/dbm.cmx
274	lib/ocaml/dbm.cmxa
275	lib/ocaml/dbm.cmxs
276	lib/ocaml/dbm.mli
277	lib/ocaml/digest.cmi	409	lib/ocaml/digest.cmi
278	lib/ocaml/digest.cmx	410	lib/ocaml/digest.cmx
279	lib/ocaml/digest.ml	411	lib/ocaml/digest.ml
280	lib/ocaml/digest.mli	412	lib/ocaml/digest.mli
281	%%PROF%%lib/ocaml/digest.p.cmx	413	%%PROF%%lib/ocaml/digest.p.cmx
282	lib/ocaml/dynlink.a	414	lib/ocaml/dynlink.a
283	lib/ocaml/dynlink.cmx
284	lib/ocaml/dynlink.cmxa
285	lib/ocaml/dynlink.cma	415	lib/ocaml/dynlink.cma
286	lib/ocaml/dynlink.cmi	416	lib/ocaml/dynlink.cmi
		417	lib/ocaml/dynlink.cmx
		418	lib/ocaml/dynlink.cmxa
287	lib/ocaml/dynlink.mli	419	lib/ocaml/dynlink.mli
288	%%THREADS%%lib/ocaml/event.mli	420	%%THREADS%%lib/ocaml/event.mli
289	lib/ocaml/expunge	421	lib/ocaml/expunge
Lines 671-677 lib/ocaml/libcamlrun.a Link Here
671	lib/ocaml/libcamlrun_shared.so	803	lib/ocaml/libcamlrun_shared.so
672	lib/ocaml/libcamlstr.a	804	lib/ocaml/libcamlstr.a
673	%%X11%%lib/ocaml/libgraphics.a	805	%%X11%%lib/ocaml/libgraphics.a
674	lib/ocaml/libmldbm.a
675	lib/ocaml/libnums.a	806	lib/ocaml/libnums.a
676	%%THREADS%%lib/ocaml/libthreads.a	807	%%THREADS%%lib/ocaml/libthreads.a
677	%%THREADS%%lib/ocaml/libthreadsnat.a	808	%%THREADS%%lib/ocaml/libthreadsnat.a
Lines 721-728 lib/ocaml/obj.cmi Link Here
721	lib/ocaml/obj.cmx	852	lib/ocaml/obj.cmx
722	lib/ocaml/obj.ml	853	lib/ocaml/obj.ml
723	lib/ocaml/obj.mli	854	lib/ocaml/obj.mli
724	lib/ocaml/objinfo_helper
725	%%PROF%%lib/ocaml/obj.p.cmx	855	%%PROF%%lib/ocaml/obj.p.cmx
		856	lib/ocaml/objinfo_helper
726	lib/ocaml/ocamlbuild/ocamlbuild.cmo	857	lib/ocaml/ocamlbuild/ocamlbuild.cmo
727	lib/ocaml/ocamlbuild/ocamlbuild.cmx	858	lib/ocaml/ocamlbuild/ocamlbuild.cmx
728	lib/ocaml/ocamlbuild/ocamlbuild.o	859	lib/ocaml/ocamlbuild/ocamlbuild.o
Lines 756-761 lib/ocaml/ocamldoc/odoc_dep.cmi Link Here
756	lib/ocaml/ocamldoc/odoc_dot.cmi	887	lib/ocaml/ocamldoc/odoc_dot.cmi
757	lib/ocaml/ocamldoc/odoc_env.cmi	888	lib/ocaml/ocamldoc/odoc_env.cmi
758	lib/ocaml/ocamldoc/odoc_exception.cmi	889	lib/ocaml/ocamldoc/odoc_exception.cmi
		890	lib/ocaml/ocamldoc/odoc_gen.cmi
759	lib/ocaml/ocamldoc/odoc_global.cmi	891	lib/ocaml/ocamldoc/odoc_global.cmi
760	lib/ocaml/ocamldoc/odoc_html.cmi	892	lib/ocaml/ocamldoc/odoc_html.cmi
761	lib/ocaml/ocamldoc/odoc_info.a	893	lib/ocaml/ocamldoc/odoc_info.a
Lines 796-803 lib/ocaml/oo.cmx Link Here
796	lib/ocaml/oo.ml	928	lib/ocaml/oo.ml
797	lib/ocaml/oo.mli	929	lib/ocaml/oo.mli
798	%%PROF%%lib/ocaml/oo.p.cmx	930	%%PROF%%lib/ocaml/oo.p.cmx
799	lib/ocaml/outcometree.cmi
800	lib/ocaml/outcometree.mli
801	lib/ocaml/parsing.cmi	931	lib/ocaml/parsing.cmi
802	lib/ocaml/parsing.cmx	932	lib/ocaml/parsing.cmx
803	lib/ocaml/parsing.ml	933	lib/ocaml/parsing.ml
Lines 820-825 lib/ocaml/printf.mli Link Here
820	%%PROF%%lib/ocaml/printf.p.cmx	950	%%PROF%%lib/ocaml/printf.p.cmx
821	lib/ocaml/profiling.cmi	951	lib/ocaml/profiling.cmi
822	lib/ocaml/profiling.cmo	952	lib/ocaml/profiling.cmo
		953	lib/ocaml/profiling.cmx
		954	lib/ocaml/profiling.o
823	lib/ocaml/queue.cmi	955	lib/ocaml/queue.cmi
824	lib/ocaml/queue.cmx	956	lib/ocaml/queue.cmx
825	lib/ocaml/queue.ml	957	lib/ocaml/queue.ml
Lines 863-869 lib/ocaml/std_exit.cmo Link Here
863	lib/ocaml/std_exit.cmx	995	lib/ocaml/std_exit.cmx
864	lib/ocaml/std_exit.ml	996	lib/ocaml/std_exit.ml
865	lib/ocaml/std_exit.o	997	lib/ocaml/std_exit.o
866	lib/ocaml/std_exit.p.cmx	998	%%PROF%%lib/ocaml/std_exit.p.cmx
867	lib/ocaml/std_exit.p.o	999	lib/ocaml/std_exit.p.o
868	lib/ocaml/stdlib.a	1000	lib/ocaml/stdlib.a
869	lib/ocaml/stdlib.cma	1001	lib/ocaml/stdlib.cma
Lines 893-902 lib/ocaml/stringLabels.ml Link Here
893	lib/ocaml/stringLabels.mli	1025	lib/ocaml/stringLabels.mli
894	%%PROF%%lib/ocaml/stringLabels.p.cmx	1026	%%PROF%%lib/ocaml/stringLabels.p.cmx
895	lib/ocaml/stublibs/dllbigarray.so	1027	lib/ocaml/stublibs/dllbigarray.so
		1028	lib/ocaml/stublibs/dllcamlstr.so
896	%%X11%%lib/ocaml/stublibs/dllgraphics.so	1029	%%X11%%lib/ocaml/stublibs/dllgraphics.so
897	%%TK%%lib/ocaml/stublibs/dlllabltk.so	1030	%%TK%%lib/ocaml/stublibs/dlllabltk.so
898	lib/ocaml/stublibs/dllcamlstr.so
899	lib/ocaml/stublibs/dllmldbm.so
900	lib/ocaml/stublibs/dllnums.so	1031	lib/ocaml/stublibs/dllnums.so
901	%%THREADS%%lib/ocaml/stublibs/dllthreads.so	1032	%%THREADS%%lib/ocaml/stublibs/dllthreads.so
902	lib/ocaml/stublibs/dllunix.so	1033	lib/ocaml/stublibs/dllunix.so
Lines 922-931 lib/ocaml/sys.mli Link Here
922	%%THREADS%%lib/ocaml/threads/threads.cma	1053	%%THREADS%%lib/ocaml/threads/threads.cma
923	%%THREADS%%lib/ocaml/threads/threads.cmxa	1054	%%THREADS%%lib/ocaml/threads/threads.cmxa
924	lib/ocaml/topdirs.cmi	1055	lib/ocaml/topdirs.cmi
925	lib/ocaml/toplevellib.cma
926	lib/ocaml/toploop.cmi
927	lib/ocaml/topmain.cmi
928	lib/ocaml/topstart.cmo
929	lib/ocaml/unix.a	1056	lib/ocaml/unix.a
930	lib/ocaml/unix.cma	1057	lib/ocaml/unix.cma
931	lib/ocaml/unix.cmi	1058	lib/ocaml/unix.cmi
Lines 955-960 lib/ocaml/weak.cmx Link Here
955	lib/ocaml/weak.ml	1082	lib/ocaml/weak.ml
956	lib/ocaml/weak.mli	1083	lib/ocaml/weak.mli
957	%%PROF%%lib/ocaml/weak.p.cmx	1084	%%PROF%%lib/ocaml/weak.p.cmx
		1085	%%TK%%%%EXAMPLESDIR%%/examples_camltk/.ignore
958	%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile	1086	%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile
959	%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt	1087	%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt
960	%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml	1088	%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml
Lines 972-977 lib/ocaml/weak.mli Link Here
972	%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml	1100	%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml
973	%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml	1101	%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml
974	%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml	1102	%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml
		1103	%%TK%%%%EXAMPLESDIR%%/examples_labltk/.ignore
975	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif	1104	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif
976	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile	1105	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile
977	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt	1106	%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt
Lines 996-1005 lib/ocaml/weak.mli Link Here
996	@dirrm lib/ocaml/ocamldoc	1125	@dirrm lib/ocaml/ocamldoc
997	@dirrm lib/ocaml/ocamlbuild	1126	@dirrm lib/ocaml/ocamlbuild
998	%%TK%%@dirrmtry lib/ocaml/labltk	1127	%%TK%%@dirrmtry lib/ocaml/labltk
		1128	@dirrm lib/ocaml/compiler-libs
999	@dirrm lib/ocaml/camlp4/Camlp4Top	1129	@dirrm lib/ocaml/camlp4/Camlp4Top
1000	@dirrm lib/ocaml/camlp4/Camlp4Printers	1130	@dirrm lib/ocaml/camlp4/Camlp4Printers
1001	@dirrm lib/ocaml/camlp4/Camlp4Parsers	1131	@dirrm lib/ocaml/camlp4/Camlp4Parsers
1002	@dirrm lib/ocaml/camlp4/Camlp4Filters	1132	@dirrm lib/ocaml/camlp4/Camlp4Filters
1003	@dirrm lib/ocaml/camlp4	1133	@dirrm lib/ocaml/camlp4
1004	@dirrm lib/ocaml/caml	1134	@dirrm lib/ocaml/caml
1005	@comment lib/ocaml will be added by Makefile	1135	@dirrm lib/ocaml