Updated package to latest version, 1.4. Changes include:

* Fixed performance bug when many arguments need to be processed
* Auto-configuring ocamldoc.opt if it is found
* New config switch -no-custom to prevent that "ocamlfind" is linked in
  custom-runtime mode (bytecode only)
* The library dbm is no longer part of OCaml, and now optional in findlib
* Support for ocamloptp.
* New function Topfind.log for controlling the verbosity
* Rewritten Fl_metascanner without camlp4

Also changed maintainer e-mail address.

3 files changed, 23 insertions, 23 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 0de9f14be17..87eb2382fb1 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:17:33 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/05 13:57:58 jaapb Exp $
 #
 
-DISTNAME=		findlib-1.3.3
+DISTNAME=		findlib-1.4
 PKGNAME=		ocaml-${DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
-MAINTAINER=		jaapb@kerguelen.org
+MAINTAINER=		jaapb@NetBSD.org
 HOMEPAGE=		http://www.camlcity.org/
 COMMENT=		Library finder for OCaml
 LICENSE=		mit
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index bc6a5ff9ecd..fe8cea66b5d 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2012/08/14 06:56:21 wiz Exp $
+$NetBSD: distinfo,v 1.7 2013/07/05 13:57:58 jaapb Exp $
 
-SHA1 (findlib-1.3.3.tar.gz) = 5d1a52b77145348ded29fefe13736694aabb1868
-RMD160 (findlib-1.3.3.tar.gz) = 1a13d069d8dc2140c81d22205cf5b06e727d85c4
-Size (findlib-1.3.3.tar.gz) = 231414 bytes
+SHA1 (findlib-1.4.tar.gz) = 07048076758e4ca892f06ff535d7cab033833bde
+RMD160 (findlib-1.4.tar.gz) = ab81e1521fe51ab69427d791347ad21ad404855a
+Size (findlib-1.4.tar.gz) = 231526 bytes
 SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
-SHA1 (patch-src_findlib_Makefile) = adddf9a10429da4a09794c22dc7046fa91a0befe
+SHA1 (patch-src_findlib_Makefile) = be49342260bd27365716f5a05632c98904533276
diff --git a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
index e954c163433..be1fa6e5890 100644
--- a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
+++ b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
@@ -1,38 +1,39 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.2 2012/08/14 06:56:21 wiz Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.3 2013/07/05 13:57:58 jaapb Exp $
 
-make package support DESTDIR
---- src/findlib/Makefile.orig	2012-07-09 09:29:16.000000000 +0000
+Install into DESTDIR, use BSD install commands
+--- src/findlib/Makefile.orig	2013-06-11 07:27:39.000000000 +0000
 +++ src/findlib/Makefile
-@@ -80,23 +80,24 @@ clean:
- 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
+@@ -84,23 +84,24 @@ clean:
+ 	#rm -f ocaml_args.ml
  
  install: all
 -	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 -	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
-+	mkdir -p "${DESTDIR}$(prefix)$(OCAML_SITELIB)/$(NAME)"
-+	mkdir -p "${DESTDIR}$(prefix)$(OCAMLFIND_BIN)"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +	test $(INSTALL_TOPFIND) -eq 0 || \
-+		cp topfind "${DESTDIR}$(prefix)$(OCAML_CORE_STDLIB)"
++	  $(BSD_INSTALL_SCRIPT) 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 META` && \
 -	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
-+	cp $$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)"
-+	cp $$f "${DESTDIR}$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
++	$(BSD_INSTALL_SCRIPT) $$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)/"; \
-+	    cp 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"
-+		"${DESTDIR}$(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.