Update to findlib 1.5.1

Changelog at http://projects.camlcity.org/projects/dl/findlib-1.5.1/doc/README

8 files changed, 118 insertions, 91 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 39c95424a8d5..62bcd57ce3aa 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	findlib
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5.1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
@@ -19,6 +18,8 @@ ALL_TARGET=	all opt
 CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
 		-sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \
 		-config "${PREFIX}/etc/findlib.conf"
+USE_OCAML_FINDLIB=yes
+OCAMLFIND_DEPEND=	# Avoid dependency loop
 
 OPTIONS_DEFINE=	TOOLBOX
 OPTIONS_DEFAULT=TOOLBOX
@@ -30,19 +31,23 @@ MAKE_JOBS_UNSAFE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \
 		${WRKSRC}/findlib.conf.in
 
 post-install:
-.if ${PORT_OPTIONS:MTOOLBOX}
-	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
-.endif
+	@-${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
 		"! -regex .*ref-man.*"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocamlfind
+	# Copied from Makefile; requires functional installation:
+	cd ${WRKSRC}/src/bytes/_build && \
+	${SETENV} ${MAKE_ENV} \
+		OCAMLFIND_CONF=${STAGEDIR}${PREFIX}/etc/findlib.conf \
+		${STAGEDIR}${PREFIX}/bin/ocamlfind install bytes ../META \
+			bytes.cmi bytes.cma -optional \
+			bytes.cmx bytes.cmxa bytes.a bytes.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 79ee6e64076f..0fa0331c656c 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.4.1.tar.gz) = ce7fb1cbd551ca4c5c58c7d4230e6fe0b7194bfd6919e4f637c8946cc2c9ab31
-SIZE (findlib-1.4.1.tar.gz) = 231647
+SHA256 (findlib-1.5.1.tar.gz) = 9bae93b2804d78d1cb1aed7c5384b38a632b696867554da29717a79ec1c0860e
+SIZE (findlib-1.5.1.tar.gz) = 234429
diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile
index 3a3fb8de7ad7..5bc58f8c2698 100644
--- a/devel/ocaml-findlib/files/patch-Makefile
+++ b/devel/ocaml-findlib/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-06-11 09:27:39.000000000 +0200
-+++ Makefile	2014-02-23 12:02:08.000000000 +0100
-@@ -17,13 +17,13 @@ opt:
+--- Makefile.orig	2014-06-25 12:23:05.000000000 +0200
++++ Makefile	2014-06-28 20:36:14.000000000 +0200
+@@ -17,14 +17,14 @@ opt:
  	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
  
  install:
@@ -8,16 +8,17 @@
 -	mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
+ 	$(MAKE) install-config
  	for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
  	$(MAKE) install-meta
  	cd src/findlib; $(MAKE) install-num-top
- 	$(MAKE) install-config
--	cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
-+	${BSD_INSTALL_SCRIPT}  tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ 	if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
+-		cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
++		${BSD_INSTALL_SCRIPT}  tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
+ 	fi
  	$(MAKE) install-doc
  
- uninstall:
-@@ -69,9 +69,9 @@ findlib.conf: findlib.conf.in 
+@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
  
  .PHONY: install-doc
  install-doc:
@@ -30,7 +31,7 @@
  
  .PHONY: uninstall-doc
  uninstall-doc:
-@@ -84,7 +84,7 @@ uninstall-doc:
+@@ -86,7 +86,7 @@ uninstall-doc:
  
  .PHONY: install-meta
  install-meta:
@@ -39,7 +40,7 @@
  
  .PHONY: uninstall-meta
  uninstall-meta:
-@@ -92,9 +92,9 @@ uninstall-meta:
+@@ -94,9 +94,9 @@ uninstall-meta:
  
  .PHONY: install-config
  install-config:
diff --git a/devel/ocaml-findlib/files/patch-src_bytes_Makefile b/devel/ocaml-findlib/files/patch-src_bytes_Makefile
new file mode 100644
index 000000000000..19843daab62d
--- /dev/null
+++ b/devel/ocaml-findlib/files/patch-src_bytes_Makefile
@@ -0,0 +1,10 @@
+--- src/bytes/Makefile.orig	2014-06-29 13:59:16.000000000 +0200
++++ src/bytes/Makefile	2014-06-29 13:59:19.000000000 +0200
+@@ -11,7 +11,6 @@ opt:
+ 	$(OCAMLBUILD) $(NATIVE_FILES)
+ 
+ install: all
+-	cd _build/ && ocamlfind install bytes ../META $(BYTE_FILES) -optional $(NATIVE_FILES)
+ 
+ uninstall:
+ 	ocamlfind remove bytes
diff --git a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
index ede32667e6fa..1922ad1cd084 100644
--- a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
+++ b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
@@ -1,10 +1,11 @@
---- src/findlib-toolbox/Makefile.orig	2013-06-11 09:27:39.000000000 +0200
-+++ src/findlib-toolbox/Makefile	2014-02-23 12:02:16.000000000 +0100
-@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
+--- src/findlib-toolbox/Makefile.orig	2014-06-25 12:23:06.000000000 +0200
++++ src/findlib-toolbox/Makefile	2014-06-28 20:52:29.000000000 +0200
+@@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
  	 	findlib.cma make_wizard.ml
  
  install:
 -	cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
++	${BSD_INSTALL_DATA}  -d $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
 +	${BSD_INSTALL_DATA}  make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
  
  # uninstall: Nothing to do, because the removal of the findlib core also
diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
index 01bd885d36f1..5e49147433fe 100644
--- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile
+++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
@@ -1,5 +1,5 @@
---- src/findlib/Makefile.orig	2013-06-11 09:27:39.000000000 +0200
-+++ src/findlib/Makefile	2014-02-23 12:02:38.000000000 +0100
+--- src/findlib/Makefile.orig	2014-06-25 12:23:06.000000000 +0200
++++ src/findlib/Makefile	2014-06-29 13:48:58.000000000 +0200
 @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
  OCAMLLEX = ocamllex
  #CAMLP4O =  camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
@@ -8,7 +8,7 @@
  
  
  OBJECTS        = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
-@@ -84,23 +85,23 @@ clean:
+@@ -87,23 +88,23 @@ clean:
  	#rm -f ocaml_args.ml
  
  install: all
@@ -17,25 +17,26 @@
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
-+	test $(INSTALL_TOPFIND) -eq 0 || ${BSD_INSTALL_SCRIPT}  topfind "$(DESTDIR)$(prefix)$(OCAML_LIBBIN)"
- 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
++	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
+ 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
 -	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
-+	${BSD_INSTALL_DATA}  $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
++	${BSD_INSTALL_DATA} $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
 -	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
-+	${BSD_INSTALL_SCRIPT}  $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
++	${BSD_INSTALL_DATA} $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
  	# the following "if" block is only needed for 4.00beta2
  	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
  	    cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
 -	    cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
-+	    ${BSD_INSTALL_DATA}  topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
++	    ${BSD_INSTALL_DATA} topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
  	fi
  
  install-num-top:
 -	mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
-+	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
- 	cp num_top.cma num_top.cmi num_top_printers.cmi \
+-	cp num_top.cma num_top.cmi num_top_printers.cmi \
 -		"$(prefix)$(OCAML_SITELIB)/num-top"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
++	${BSD_INSTALL_DATA} num_top.cma num_top.cmi num_top_printers.cmi \
 +		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
  
  # Note: uninstall-num-top is part of the removal of the META files.
diff --git a/devel/ocaml-findlib/pkg-descr b/devel/ocaml-findlib/pkg-descr
index 7de72a7a573a..d4f0c8c76e63 100644
--- a/devel/ocaml-findlib/pkg-descr
+++ b/devel/ocaml-findlib/pkg-descr
@@ -11,4 +11,4 @@ compilation and linkage, there are new frontends of the various OCaml
 compilers that can directly deal with packages.
 
 Author:	Gerd Stolpmann <gerd@gerd-stolpmann.de>
-WWW:	http://projects.camlcity.org/projects/findlib.html
+WWW: http://projects.camlcity.org/projects/findlib.html
diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist
index 4efca4bd2076..b000a729f61b 100644
--- a/devel/ocaml-findlib/pkg-plist
+++ b/devel/ocaml-findlib/pkg-plist
@@ -1,39 +1,47 @@
 bin/ocamlfind
 bin/safe_camlp4
-etc/findlib.conf
-lib/ocaml/site-lib/bigarray/META
-lib/ocaml/site-lib/camlp4/META
-lib/ocaml/site-lib/compiler-libs/META
-lib/ocaml/site-lib/dynlink/META
-lib/ocaml/site-lib/findlib/META
-lib/ocaml/site-lib/findlib/Makefile.config
-lib/ocaml/site-lib/findlib/findlib.a
-lib/ocaml/site-lib/findlib/findlib.cma
-lib/ocaml/site-lib/findlib/findlib.cmi
-lib/ocaml/site-lib/findlib/findlib.cmxa
-lib/ocaml/site-lib/findlib/findlib.mli
-lib/ocaml/site-lib/findlib/findlib_top.cma
-lib/ocaml/site-lib/findlib/fl_metascanner.cmi
-lib/ocaml/site-lib/findlib/fl_metascanner.mli
-lib/ocaml/site-lib/findlib/fl_metatoken.cmi
-lib/ocaml/site-lib/findlib/fl_package_base.cmi
-lib/ocaml/site-lib/findlib/fl_package_base.mli
-%%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard
-%%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard.pattern
-lib/ocaml/site-lib/findlib/topfind.cmi
-lib/ocaml/site-lib/findlib/topfind.mli
-lib/ocaml/site-lib/graphics/META
-%%TOOLBOX%%lib/ocaml/site-lib/labltk/META
-lib/ocaml/site-lib/num-top/META
-lib/ocaml/site-lib/num-top/num_top.cma
-lib/ocaml/site-lib/num-top/num_top.cmi
-lib/ocaml/site-lib/num-top/num_top_printers.cmi
-lib/ocaml/site-lib/num/META
-lib/ocaml/site-lib/ocamlbuild/META
-lib/ocaml/site-lib/stdlib/META
-lib/ocaml/site-lib/str/META
-lib/ocaml/site-lib/threads/META
-lib/ocaml/site-lib/unix/META
+%%ETCDIR%%.conf
+%%OCAML_SITELIBDIR%%/bigarray/META
+%%OCAML_SITELIBDIR%%/bytes/META
+%%OCAML_SITELIBDIR%%/bytes/bytes.a
+%%OCAML_SITELIBDIR%%/bytes/bytes.cma
+%%OCAML_SITELIBDIR%%/bytes/bytes.cmi
+%%OCAML_SITELIBDIR%%/bytes/bytes.cmx
+%%OCAML_SITELIBDIR%%/bytes/bytes.cmxa
+%%OCAML_SITELIBDIR%%/bytes/bytes.cmxs
+%%OCAML_SITELIBDIR%%/camlp4/META
+%%OCAML_SITELIBDIR%%/compiler-libs/META
+%%OCAML_SITELIBDIR%%/dynlink/META
+%%OCAML_SITELIBDIR%%/findlib/META
+%%OCAML_SITELIBDIR%%/findlib/Makefile.config
+%%OCAML_SITELIBDIR%%/findlib/findlib.a
+%%OCAML_SITELIBDIR%%/findlib/findlib.cma
+%%OCAML_SITELIBDIR%%/findlib/findlib.cmi
+%%OCAML_SITELIBDIR%%/findlib/findlib.cmxa
+%%OCAML_SITELIBDIR%%/findlib/findlib.cmxs
+%%OCAML_SITELIBDIR%%/findlib/findlib.mli
+%%OCAML_SITELIBDIR%%/findlib/findlib_top.cma
+%%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi
+%%OCAML_SITELIBDIR%%/findlib/fl_metascanner.mli
+%%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi
+%%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi
+%%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli
+%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard
+%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
+%%OCAML_SITELIBDIR%%/findlib/topfind.cmi
+%%OCAML_SITELIBDIR%%/findlib/topfind.mli
+%%OCAML_SITELIBDIR%%/graphics/META
+%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
+%%OCAML_SITELIBDIR%%/num-top/META
+%%OCAML_SITELIBDIR%%/num-top/num_top.cma
+%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
+%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
+%%OCAML_SITELIBDIR%%/num/META
+%%OCAML_SITELIBDIR%%/ocamlbuild/META
+%%OCAML_SITELIBDIR%%/stdlib/META
+%%OCAML_SITELIBDIR%%/str/META
+%%OCAML_SITELIBDIR%%/threads/META
+%%OCAML_SITELIBDIR%%/unix/META
 lib/ocaml/topfind
 man/man1/ocamlfind.1.gz
 man/man5/META.5.gz
@@ -76,11 +84,13 @@ man/man5/site-lib.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/guide-html/x400.html
 %%PORTDOCS%%%%DOCSDIR%%/guide-html/x412.html
 %%PORTDOCS%%%%DOCSDIR%%/guide-html/x464.html
-%%PORTDOCS%%%%DOCSDIR%%/guide-html/x468.html
+%%PORTDOCS%%%%DOCSDIR%%/guide-html/x471.html
+%%PORTDOCS%%%%DOCSDIR%%/guide-html/x475.html
 %%PORTDOCS%%%%DOCSDIR%%/guide-html/x81.html
 %%PORTDOCS%%%%DOCSDIR%%/guide-html/x89.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.dtd
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/TIMESTAMP
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/c1032.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/lib/Findlib.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/lib/Fl_metascanner.html
@@ -101,14 +111,13 @@ man/man5/site-lib.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/lib/type_Fl_metascanner.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/lib/type_Fl_package_base.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/lib/type_Topfind.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/c1024.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/p1022.html
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/p1030.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/p15.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/p679.html
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/p685.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-html/r17.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/r681.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/r775.html
-%%PORTDOCS%%%%DOCSDIR%%/ref-html/r964.html
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/r687.html
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/r783.html
+%%PORTDOCS%%%%DOCSDIR%%/ref-html/r972.html
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib.dsl
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib.sgml
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib_conf.mod
@@ -121,24 +130,24 @@ man/man5/site-lib.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib_reference.xml
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib_sitelib.mod
 %%PORTDOCS%%%%DOCSDIR%%/src/findlib_topfind.mod
+@dirrm %%OCAML_SITELIBDIR%%/bigarray
+@dirrm %%OCAML_SITELIBDIR%%/bytes
+@dirrm %%OCAML_SITELIBDIR%%/camlp4
+@dirrm %%OCAML_SITELIBDIR%%/compiler-libs
+@dirrm %%OCAML_SITELIBDIR%%/dynlink
+@dirrm %%OCAML_SITELIBDIR%%/findlib
+@dirrm %%OCAML_SITELIBDIR%%/graphics
+%%TOOLBOX%%@dirrmtry %%OCAML_SITELIBDIR%%/labltk
+@dirrm %%OCAML_SITELIBDIR%%/num
+@dirrm %%OCAML_SITELIBDIR%%/num-top
+@dirrm %%OCAML_SITELIBDIR%%/ocamlbuild
+@dirrm %%OCAML_SITELIBDIR%%/stdlib
+@dirrm %%OCAML_SITELIBDIR%%/str
+@dirrm %%OCAML_SITELIBDIR%%/threads
+@dirrm %%OCAML_SITELIBDIR%%/unix
+@dirrmtry %%OCAML_SITELIBDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide-html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ref-html/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ref-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide-html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/src
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc/ocaml
-@dirrm lib/ocaml/site-lib/unix
-@dirrm lib/ocaml/site-lib/threads
-@dirrm lib/ocaml/site-lib/str
-@dirrm lib/ocaml/site-lib/stdlib
-@dirrm lib/ocaml/site-lib/ocamlbuild
-@dirrm lib/ocaml/site-lib/num-top
-@dirrm lib/ocaml/site-lib/num
-@dirrm lib/ocaml/site-lib/graphics
-@dirrm lib/ocaml/site-lib/findlib
-@dirrm lib/ocaml/site-lib/dynlink
-@dirrm lib/ocaml/site-lib/camlp4
-@dirrm lib/ocaml/site-lib/compiler-libs
-@dirrm lib/ocaml/site-lib/bigarray
-%%TOOLBOX%%@dirrmtry lib/ocaml/site-lib/labltk
-@dirrmtry lib/ocaml/site-lib