Update OCaml findlib to 1.2.6

Changes:

-  1.2.5: Fix: Again CR deletion... Turns out some OS do not  understand '\r'
   but only '\015' (thanks to Isaiah Weiner)
   Support for Win64 (untested; thanks to David Allsopp)
   ocamlfind no longer emits auto-generated -ccopt options. These  tend to
   accumulate, and it is possible that for large projects  the maximum command
   line length is exceeded. Current versions of  the O'Caml compilers do not
   need these extra -ccopt anyway, so  this code is completely dropped.

-  1.2.4: Fix: Bigarray needs unix (Thanks to Markus Mottl)
   Fix: In the version of camlp4 provided by O'Caml 3.11 various  libraries do
   not contain dynlink anymore. Because of this, dynlink  becomes a
   prerequisite of camlp4. (Thanks to Martin Jambon)
   Attempt: Fixing the space issue for paths (Win32). It is unclear  whether it
   is solved. (Thanks to Christophe Troestler)

-  1.2.3: Solving the CR deletion differently, to  make OS X happy.

-  1.2.2: Fix: Problem with CR character (Cygwin)  (Thanks to David Allsopp)
   Fix: Case-insensitive filesystems (partially solved)  (Thanks to David
   Allsopp)
   Fix: File name with backslashes at the end (Win32; thanks to Dmitry
   Grebeniuk)

-  1.2.1: Fix: Camlp4 rules now activate the stream parser extension

-  1.2: Fix in build scripts: Prepending $(prefix) when installing safe_camlp4
   (thanks to Daniel Janus)
   Non-existing -I directories are ignored (thanks to Nicolas Pouillard)
   A script to create a MacOS X package (thanks to Pietro Abate)
   Better support for Windows (with help from Robert Roessler and David
   Allsopp)
   Support for camlp4 on O'Caml 3.10
   Fix: "ocamlfind install" with "-patch" option writes now correct META file
   for the case that subpackages occur
   Adding environment variable OCAMLFIND_IGNORE_DUPS_IN to reduce the number of
   warnings ocamlfind emits

5 files changed, 92 insertions, 18 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index eded35defd8..6a9bada9877 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/05/28 21:22:35 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2010/08/21 15:27:31 asau Exp $
 #
 
-DISTNAME=		findlib-1.1.2pl1
+DISTNAME=		findlib-1.2.6
 PKGNAME=		ocaml-${DISTNAME}
-PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -21,8 +20,7 @@ CONFIGURE_ARGS+=	-mandir ${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	-config ${PKG_SYSCONFDIR}/ocamlfind.conf
 
 EGDIR=			${PREFIX}/share/examples/ocaml-findlib
-INSTALL_MAKE_FLAGS+=	OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf \
-			prefix=${DESTDIR}
+INSTALL_MAKE_FLAGS+=	OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
 INSTALLATION_DIRS=	libexec bin
 
 CONF_FILES=		${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
diff --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST
index fb50385e528..d40c25d1a5d 100644
--- a/devel/ocaml-findlib/PLIST
+++ b/devel/ocaml-findlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/08/21 15:27:31 asau Exp $
 bin/ocamlfind
 bin/safe_camlp4
 lib/ocaml/site-lib/bigarray/META
@@ -13,6 +13,7 @@ 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
 lib/ocaml/site-lib/findlib/topfind.cmi
@@ -23,6 +24,7 @@ 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
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 49fe968c43a..e5af8e8fb76 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/02/16 16:29:18 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/08/21 15:27:31 asau Exp $
 
-SHA1 (findlib-1.1.2pl1.tar.gz) = ccd8b9d6249b5a4097040d32b90048b11054f461
-RMD160 (findlib-1.1.2pl1.tar.gz) = 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3
-Size (findlib-1.1.2pl1.tar.gz) = 153542 bytes
-SHA1 (patch-aa) = deb6a80bb41d1328cbf27d44d7a194a53088a9ec
+SHA1 (findlib-1.2.6.tar.gz) = 50d2764025168a5f3cab7f559b8fdf3cb680e405
+RMD160 (findlib-1.2.6.tar.gz) = 76ee6ba0cf5c4ec8693dec14fae8582ad6cd5de3
+Size (findlib-1.2.6.tar.gz) = 162458 bytes
+SHA1 (patch-aa) = f11eb4120e6be80c2f225d4c2597c33aceefdce6
+SHA1 (patch-ab) = 043d43f04c61ced0f3f9f3b6d59f89e83d6a18ee
diff --git a/devel/ocaml-findlib/patches/patch-aa b/devel/ocaml-findlib/patches/patch-aa
index 6237c5500a5..fa2539b039c 100644
--- a/devel/ocaml-findlib/patches/patch-aa
+++ b/devel/ocaml-findlib/patches/patch-aa
@@ -1,13 +1,56 @@
-$NetBSD: patch-aa,v 1.1 2009/02/16 16:29:18 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2010/08/21 15:27:31 asau Exp $
 
---- Makefile.orig	2009-02-16 17:09:51.000000000 +0100
-+++ Makefile
-@@ -22,7 +22,7 @@ install:
+--- Makefile.orig	2010-08-17 22:50:28.000000000 +0400
++++ Makefile	2010-08-21 19:10:59.000000000 +0400
+@@ -17,13 +17,13 @@
+ 	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
+ 
+ install:
+-	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
+-	mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
++	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
+ 	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 $(OCAMLFIND_BIN)
-+	cp tools/safe_camlp4 ${DESTDIR}$(OCAMLFIND_BIN)
+-	cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
++	cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ 	$(MAKE) install-doc
  
  uninstall:
- 	$(MAKE) uninstall-doc
+@@ -66,9 +66,9 @@
+ 
+ .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
+ 
+ .PHONY: uninstall-doc
+ uninstall-doc:
+@@ -81,7 +81,7 @@
+ 
+ .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"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ 
+ .PHONY: uninstall-meta
+ uninstall-meta:
+@@ -89,9 +89,9 @@
+ 
+ .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 $(prefix)$(OCAMLFIND_CONF) !!!"; fi
++	test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
+ 
+ .PHONY: uninstall-config
+ uninstall-config:
diff --git a/devel/ocaml-findlib/patches/patch-ab b/devel/ocaml-findlib/patches/patch-ab
new file mode 100644
index 00000000000..3389d6aa702
--- /dev/null
+++ b/devel/ocaml-findlib/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2010/08/21 15:27:31 asau Exp $
+
+--- src/findlib/Makefile.orig	2010-08-17 22:50:28.000000000 +0400
++++ src/findlib/Makefile	2010-08-21 19:09:29.000000000 +0400
+@@ -78,18 +78,18 @@
+ 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
+ 
+ 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)"
++	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 META` && \
+-	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
++	cp $$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)"
+ 
+ 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 \
+-		"$(prefix)$(OCAML_SITELIB)/num-top"
++		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
+ 
+ # Note: uninstall-num-top is part of the removal of the META files.
+