Index: head/devel/ocaml-findlib/Makefile
===================================================================
--- head/devel/ocaml-findlib/Makefile	(revision 385507)
+++ head/devel/ocaml-findlib/Makefile	(revision 385508)
@@ -1,48 +1,49 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	findlib
 PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	OCaml package manager
 
 USE_OCAML=	yes
 HAS_CONFIGURE=	yes
 USES=		gmake
 ALL_TARGET=	all opt
 
 CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
 		-sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \
 		-config "${PREFIX}/etc/findlib.conf"
+USE_OCAML_CAMLP4=yes
 USE_OCAML_FINDLIB=yes
 OCAMLFIND_DEPEND=	# Avoid dependency loop
 
 OPTIONS_DEFINE=	TOOLBOX DOCS
 OPTIONS_DEFAULT=TOOLBOX
 OPTIONS_SUB=	yes
 TOOLBOX_DESC=	Include toolbox interface (requires OCaml with TK)
 TOOLBOX_CONFIGURE_ON=	-with-toolbox
 
 MAKE_JOBS_UNSAFE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \
 		${WRKSRC}/findlib.conf.in
 
 post-install:
 	@-${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
 
 .include <bsd.port.mk>
Index: head/devel/ocaml-findlib/pkg-plist
===================================================================
--- head/devel/ocaml-findlib/pkg-plist	(revision 385507)
+++ head/devel/ocaml-findlib/pkg-plist	(revision 385508)
@@ -1,38 +1,40 @@
 bin/ocamlfind
+bin/safe_camlp4
 %%ETCDIR%%.conf
 %%OCAML_SITELIBDIR%%/bigarray/META
 %%OCAML_SITELIBDIR%%/bytes/META
+%%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
 %%OCAML_SITELIBDIR%%/findlib/topfind.cmi
 %%OCAML_SITELIBDIR%%/findlib/topfind.mli
 %%OCAML_SITELIBDIR%%/graphics/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
 man/man5/findlib.conf.5.gz
 man/man5/site-lib.5.gz