Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Apr 2015 20:45:24 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385012 - in head/lang/ocaml: . files
Message-ID:  <201504292045.t3TKjO0F025992@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Wed Apr 29 20:45:23 2015
New Revision: 385012
URL: https://svnweb.freebsd.org/changeset/ports/385012

Log:
  lang/ocaml: Upgrade version 4.01 => 4.02
  
  PR:		195736
  Submitted by:	Michael Gruenewald (maintainer)
  Add'l fixes:	marino
  
  Besides typical port cleanup, the dragonfly patches which had been
  removed for the update were added back to the configure patch.

Deleted:
  head/lang/ocaml/files/edit_pkg-plist.sed
  head/lang/ocaml/files/patch-Makefile
  head/lang/ocaml/files/patch-asmcomp__arm__arch.ml
  head/lang/ocaml/files/patch-asmrun-Makefile
  head/lang/ocaml/files/patch-asmrun__arm.S
  head/lang/ocaml/files/patch-byterun-Makefile.common
  head/lang/ocaml/files/patch-camlp4-man_Makefile
  head/lang/ocaml/files/patch-config-auto-aux-async_io.c
  head/lang/ocaml/files/patch-ocamlbuild
  head/lang/ocaml/files/patch-ocamldoc_Makefile
  head/lang/ocaml/files/patch-otherlibs-Makefile.shared
  head/lang/ocaml/files/patch-otherlibs-dynlink-Makefile
  head/lang/ocaml/files/patch-otherlibs-labltk-lib-Makefile
  head/lang/ocaml/files/patch-otherlibs-labltk-support-Makefile
  head/lang/ocaml/files/patch-otherlibs-systhreads-Makefile
  head/lang/ocaml/files/patch-otherlibs-threads-Makefile
  head/lang/ocaml/files/patch-stdlib-Makefile
Modified:
  head/lang/ocaml/Makefile
  head/lang/ocaml/distinfo
  head/lang/ocaml/files/patch-configure
  head/lang/ocaml/pkg-plist

Modified: head/lang/ocaml/Makefile
==============================================================================
--- head/lang/ocaml/Makefile	Wed Apr 29 20:24:44 2015	(r385011)
+++ head/lang/ocaml/Makefile	Wed Apr 29 20:45:23 2015	(r385012)
@@ -1,20 +1,17 @@
 # Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 # $FreeBSD$
-
 # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
+
 PORTNAME=	ocaml
-PORTVERSION=	4.01.0
-PORTREVISION=	4
+PORTVERSION=	4.02.1
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
-		${MASTER_SITE_GENTOO}
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
+		http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
 MASTER_SITE_SUBDIR=	distfiles
 PKGNAMESUFFIX=	${SFX}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	michipili@gmail.com
-COMMENT=	The Objective Caml compiler and programming environment
+COMMENT=	Objective Caml compiler and programming environment
 
 LICENSE=		QPL10 LGPL20
 LICENSE_COMB=		multi
@@ -22,7 +19,7 @@ LICENSE_NAME_QPL10=	Q Public License, Ve
 LICENSE_FILE_QPL10=	${WRKSRC}/LICENSE
 LICENSE_PERMS_QPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cpe gmake tar:bzip2
+USES=		cpe gmake tar:xz
 CPE_VENDOR=	inria
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
@@ -38,9 +35,8 @@ CONFIGURE_ARGS=	-verbose -prefix "${PREF
 		-aspp "${CC} -c" \
 		-partialld "${LD} -r"
 
-OPTIONS_DEFINE= X11 TK THREADS DOCS EXAMPLES
-OPTIONS_DEFAULT=X11 TK THREADS
-TK_DESC=	LablTk library (requires X11 support)
+OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES
+OPTIONS_DEFAULT=X11 THREADS
 CMP_LIB_DESC=	Install compiler libraries
 PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
 		${DOCSDISTNAME}-refman.pdf
@@ -54,10 +50,12 @@ CONFLICTS=	metaocaml-[0-9]*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${DOCSDISTNAME}-refman-html.tar.gz \
-		${DOCSDISTNAME}-refman.ps.gz \
-		${DOCSDISTNAME}-refman.pdf
-EXTRACT_ONLY+=	${DOCSDISTNAME}-refman-html.tar.gz
+DISTFILES:=	${DISTNAME}${EXTRACT_SUFX} \
+		${DOCSDISTNAME}-refman-html.tar.gz:docs \
+		${DOCSDISTNAME}-refman.ps.gz:docs \
+		${DOCSDISTNAME}-refman.pdf:docs
+EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX} \
+		${DOCSDISTNAME}-refman-html.tar.gz
 PLIST_SUB+=	DOC=""
 PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
 .else
@@ -91,30 +89,12 @@ CONFLICTS+=	ocaml-[0-9]*
 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}" \
-			-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
+.if defined(NO_PROFILE) || ${OCAML_ARCH} == power || ${OCAML_ARCH} == amd64
 PLIST_SUB+=	PROF="@comment "
 .else
 PLIST_SUB+=	PROF=""
@@ -144,16 +124,6 @@ post-patch:
 		-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
@@ -173,23 +143,13 @@ post-configure:
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
 		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
 
-check test: install
+check-test: do-install
 	@cd ${WRKSRC}/testsuite; ${RM} -f _log; for d in tests/* ; do \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \
 	2>&1 | tee -a _log || ${TRUE} ; done ; \
 	${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})

Modified: head/lang/ocaml/distinfo
==============================================================================
--- head/lang/ocaml/distinfo	Wed Apr 29 20:24:44 2015	(r385011)
+++ head/lang/ocaml/distinfo	Wed Apr 29 20:45:23 2015	(r385012)
@@ -1,8 +1,8 @@
-SHA256 (ocaml-4.01.0.tar.bz2) = b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a
-SIZE (ocaml-4.01.0.tar.bz2) = 3691090
-SHA256 (ocaml-4.01-refman-html.tar.gz) = 01019c8f8a29a8a7f422e090704b666ade2a007d57ea9412285f88f716656001
-SIZE (ocaml-4.01-refman-html.tar.gz) = 571422
-SHA256 (ocaml-4.01-refman.ps.gz) = 4de67ef967b8b39a6f030df258087239d6f7dee869a3973d7a782b7986b809c6
-SIZE (ocaml-4.01-refman.ps.gz) = 1089703
-SHA256 (ocaml-4.01-refman.pdf) = 389e434f534153530ba234299d0f3a0e4271d18b091b9216e4a37335ebd33424
-SIZE (ocaml-4.01-refman.pdf) = 1478900
+SHA256 (ocaml-4.02.1.tar.xz) = 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc
+SIZE (ocaml-4.02.1.tar.xz) = 2031244
+SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8
+SIZE (ocaml-4.02-refman-html.tar.gz) = 612839
+SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a
+SIZE (ocaml-4.02-refman.ps.gz) = 1111960
+SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8
+SIZE (ocaml-4.02-refman.pdf) = 1519190

Modified: head/lang/ocaml/files/patch-configure
==============================================================================
--- head/lang/ocaml/files/patch-configure	Wed Apr 29 20:24:44 2015	(r385011)
+++ head/lang/ocaml/files/patch-configure	Wed Apr 29 20:45:23 2015	(r385012)
@@ -1,202 +1,54 @@
---- configure.orig	2014-05-08 09:28:26.000000000 +0200
-+++ configure	2014-05-08 09:31:54.000000000 +0200
-@@ -545,9 +545,10 @@ if test $withsharedlibs = "yes"; then
+--- configure.orig	2014-10-03 19:25:46 UTC
++++ configure
+@@ -659,7 +659,8 @@ if test $with_sharedlibs = "yes"; then
        mksharedlib="$flexlink"
        mkmaindll="$flexlink -maindll"
        shared_libraries_supported=true;;
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
 +    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*| \
-+    *-*-dragonfly*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
++    *-*-dragonfly*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
        sharedcccompopts="-fPIC"
--      mksharedlib="$bytecc -shared"
-+      mksharedlib="$bytecc $bytecclinkopts -shared"
+       mksharedlib="$bytecc -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
+@@ -766,6 +767,7 @@ if test $with_sharedlibs = "yes"; then
      x86_64-*-kfreebsd*)           natdynlink=true;;
-     i[345]86-*-freebsd*)          natdynlink=true;;
+     i[3456]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;;
+     i[3456]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;;
+     i[3456]86-*-netbsd*)          natdynlink=true;;
+@@ -833,6 +835,7 @@ case "$target" in
+   zaurus*-*-openbsd*)           arch=arm; system=bsd;;
    x86_64-*-linux*)              arch=amd64; system=linux;;
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
++  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
    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
+@@ -905,6 +908,8 @@ case "$arch,$system" in
+                   aspp="${TOOLPREF}cc -c";;
+   *,freebsd)      as="${TOOLPREF}as"
+                   aspp="${TOOLPREF}cc -c";;
++  *,dragonfly)    as="as"
++                  aspp="cc -c";;
+   amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
+                   as="${TOOLPREF}as"
+                   aspp="${TOOLPREF}gcc -c";;
+@@ -1390,7 +1395,7 @@ if test "$pthread_wanted" = "yes"; then
      bytecccompopts="$bytecccompopts -D_REENTRANT"
      nativecccompopts="$nativecccompopts -D_REENTRANT"
-     case "$host" in
+     case "$target" 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
+@@ -1560,6 +1565,7 @@ if test "$x11_include" = "not found"; th
+       else
          x11_libs="-L$dir"
-         case "$host" in
+         case "$target" in
++          *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
            *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
--          *-*-*bsd*) x11_link="-R$dir -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

Modified: head/lang/ocaml/pkg-plist
==============================================================================
--- head/lang/ocaml/pkg-plist	Wed Apr 29 20:24:44 2015	(r385011)
+++ head/lang/ocaml/pkg-plist	Wed Apr 29 20:45:23 2015	(r385012)
@@ -1,22 +1,4 @@
-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
@@ -43,23 +25,23 @@ lib/ocaml/Makefile.config
 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
@@ -72,14 +54,24 @@ lib/ocaml/bigarray.cmxs
 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
-%%PROF%%lib/ocaml/buffer.p.cmx
+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
@@ -97,179 +89,48 @@ lib/ocaml/caml/signals.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
-%%PROF%%lib/ocaml/char.p.cmx
+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
@@ -298,6 +159,7 @@ 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/deadcode.cmi
 lib/ocaml/compiler-libs/debuginfo.cmi
 lib/ocaml/compiler-libs/dll.cmi
 lib/ocaml/compiler-libs/emit.cmi
@@ -379,6 +241,7 @@ 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/strmatch.cmi
 lib/ocaml/compiler-libs/stypes.cmi
 lib/ocaml/compiler-libs/subst.cmi
 lib/ocaml/compiler-libs/switch.cmi
@@ -409,15 +272,15 @@ lib/ocaml/compiler-libs/typetexp.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
@@ -429,24 +292,24 @@ lib/ocaml/expunge
 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
@@ -459,350 +322,31 @@ lib/ocaml/genlex.mli
 %%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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504292045.t3TKjO0F025992>