Update to 1.3.3, from maintainer Jaap Boender in PR 46796:

The changes are not enormous, fixes in compatibility with various
OCaml versions (4.00 and Homebrew).

3 files changed, 16 insertions, 13 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 72661c4a2f3..f5802685f71 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/07/06 09:22:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/08/14 06:56:21 wiz Exp $
 #
 
-DISTNAME=		findlib-1.3.2
+DISTNAME=		findlib-1.3.3
 PKGNAME=		ocaml-${DISTNAME}
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 52be6783720..bc6a5ff9ecd 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2012/07/06 09:22:04 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/08/14 06:56:21 wiz Exp $
 
-SHA1 (findlib-1.3.2.tar.gz) = 3850c6732fd3b50b935806859dc7fe481112c810
-RMD160 (findlib-1.3.2.tar.gz) = 74045383f9e1f46c56dd2596199f8f7071705960
-Size (findlib-1.3.2.tar.gz) = 230556 bytes
+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 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
-SHA1 (patch-src_findlib_Makefile) = 63231a25aca3043e1b50360ff578c62099842b62
+SHA1 (patch-src_findlib_Makefile) = adddf9a10429da4a09794c22dc7046fa91a0befe
diff --git a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
index a05a56a4f4a..e954c163433 100644
--- a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
+++ b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.1 2012/07/06 09:22:04 wiz Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.2 2012/08/14 06:56:21 wiz Exp $
 
 make package support DESTDIR
---- src/findlib/Makefile.orig	2012-06-08 12:14:41.000000000 +0000
+--- src/findlib/Makefile.orig	2012-07-09 09:29:16.000000000 +0000
 +++ src/findlib/Makefile
-@@ -79,22 +79,22 @@ clean:
+@@ -80,23 +80,24 @@ clean:
  	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
  
  install: all
@@ -12,16 +12,19 @@ make package support DESTDIR
 -	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)"
++	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)"
- 	if [ -d "$(OCAML_CORE_STDLIB)/compiler-libs" ]; then \
+ 	# 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 "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
++	    cp topdirs.cmi toploop.cmi "${DESTDIR}$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
  	fi
  
  install-num-top: