Index: head/devel/ocaml-findlib/Makefile
===================================================================
--- head/devel/ocaml-findlib/Makefile	(revision 406288)
+++ head/devel/ocaml-findlib/Makefile	(revision 406289)
@@ -1,50 +1,50 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	findlib
-PORTVERSION=	1.5.6
+PORTVERSION=	1.6.1
 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
 TOOLBOX_RUN_DEPENDS=	labltk:${PORTSDIR}/x11-toolkits/ocaml-labltk
 TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
 
 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/distinfo
===================================================================
--- head/devel/ocaml-findlib/distinfo	(revision 406288)
+++ head/devel/ocaml-findlib/distinfo	(revision 406289)
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.5.6.tar.gz) = 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8
-SIZE (findlib-1.5.6.tar.gz) = 250865
+SHA256 (findlib-1.6.1.tar.gz) = 411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09
+SIZE (findlib-1.6.1.tar.gz) = 254797
Index: head/devel/ocaml-findlib/files/patch-Makefile
===================================================================
--- head/devel/ocaml-findlib/files/patch-Makefile	(revision 406288)
+++ head/devel/ocaml-findlib/files/patch-Makefile	(revision 406289)
@@ -1,55 +1,55 @@
 --- Makefile.orig	2015-10-25 12:46:54 UTC
 +++ Makefile
 @@ -17,14 +17,14 @@ opt:
  	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
  
  install:
 -	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	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
  	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
  
 @@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
  
  .PHONY: install-doc
  install-doc:
--	mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
--	-cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
--	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
-+	mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
-+	-cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
-+	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
+-	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
+-	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
+-	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
++	-cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
++	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
  
  .PHONY: uninstall-doc
  uninstall-doc:
 @@ -86,7 +86,7 @@ uninstall-doc:
  
  .PHONY: install-meta
  install-meta:
 -	for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
 +	for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; ${BSD_INSTALL_DATA}  site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
  
  .PHONY: uninstall-meta
  uninstall-meta:
 @@ -94,9 +94,9 @@ uninstall-meta:
  
  .PHONY: install-config
  install-config:
 -	mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
 -	@if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
 -	test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
 +	mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
 +	@if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
 +	test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || ${BSD_INSTALL_DATA}  findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
  
  .PHONY: uninstall-config
  uninstall-config: