Update to 1.3.2. From Jaap Boender.

-  1.3.2: Handling of empty arguments (Wojciech Meyer).
   Added entry for camlp4.fulllib.
   New switch -add for "ocamlfind install" (Hans Ole Rafaelsen).
   Further fixes for ocaml-4.00.
   Fixing the recognition of double .cmi interface files.
   Fixing -dontlink (it is now deeply interpreted).

-  1.3.1: Fixing a bug with ocamlmklib that slipped through in 1.3.0

-  1.3.0: Fixes for ocaml-4.00 (especially topfind).
   Emitting an error if the configuration file does not exist.
   Emitting a warning if the selected toolchain does not exist.
   camlp4 is referenced by "+camlp4" in META.
   Including the sources for the documentation in the tarball.
   License change (simplification) for num_top_printers.mli.
   Fix ocamlmklib wrapper: processing contracted args (like -L/dir) correctly.
   Many wrappers get a new option -passrest instructing to pass all remaining
   options on the command-line unchanged to the invoked tool.
   Prettified -help output.

6 files changed, 45 insertions, 26 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 8afa8da62cb..72661c4a2f3 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2012/03/04 09:26:55 asau Exp $
+# $NetBSD: Makefile,v 1.11 2012/07/06 09:22:04 wiz Exp $
 #
 
-DISTNAME=		findlib-1.2.8
+DISTNAME=		findlib-1.3.2
 PKGNAME=		ocaml-${DISTNAME}
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		jaapb@kerguelen.org
 HOMEPAGE=		http://www.camlcity.org/
 COMMENT=		Library finder for OCaml
+LICENSE=		mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake m4
+USE_TOOLS+=		gmake m4 bash
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		no
@@ -20,6 +21,17 @@ CONFIGURE_ARGS+=	-bindir ${PREFIX}/bin
 CONFIGURE_ARGS+=	-mandir ${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	-config ${PKG_SYSCONFDIR}/ocamlfind.conf
 
+BUILD_TARGET=		all
+PLIST_SRC=		PLIST
+
+PLIST_VARS=		opt
+.include "../../mk/bsd.prefs.mk"
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+PLIST.opt=		yes
+BUILD_TARGET+=		opt
+.endif
+
 EGDIR=			${PREFIX}/share/examples/ocaml-findlib
 INSTALL_MAKE_FLAGS+=	OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
 INSTALLATION_DIRS=	libexec bin
diff --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST
index d40c25d1a5d..bd1105fa20d 100644
--- a/devel/ocaml-findlib/PLIST
+++ b/devel/ocaml-findlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/08/21 15:27:31 asau Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/07/06 09:22:04 wiz Exp $
 bin/ocamlfind
 bin/safe_camlp4
 lib/ocaml/site-lib/bigarray/META
@@ -7,7 +7,9 @@ lib/ocaml/site-lib/dbm/META
 lib/ocaml/site-lib/dynlink/META
 lib/ocaml/site-lib/findlib/META
 lib/ocaml/site-lib/findlib/Makefile.config
+${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.a
 lib/ocaml/site-lib/findlib/findlib.cma
+${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.cmxa
 lib/ocaml/site-lib/findlib/findlib.cmi
 lib/ocaml/site-lib/findlib/findlib.mli
 lib/ocaml/site-lib/findlib/findlib_top.cma
diff --git a/devel/ocaml-findlib/buildlink3.mk b/devel/ocaml-findlib/buildlink3.mk
index eb447c07044..05c5cba4093 100644
--- a/devel/ocaml-findlib/buildlink3.mk
+++ b/devel/ocaml-findlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/06/15 05:25:46 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/07/06 09:22:04 wiz Exp $
 
 BUILDLINK_TREE+=	ocaml-findlib
 
@@ -27,8 +27,7 @@ ocaml-findlib-ldconf:
 	${CP} ${BUILDLINK_PREFIX.ocaml}/lib/ocaml/ld.conf		\
 	    ${BUILDLINK_DIR}/lib/ocaml
 
-.endif # OCAML_FINDLIB_BUILDLINK3_MK
-
 INSTALLATION_DIRS+=	lib/ocaml/site-lib
+.endif # OCAML_FINDLIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-findlib
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 80d33760fa2..52be6783720 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/03/04 09:26:55 asau Exp $
+$NetBSD: distinfo,v 1.5 2012/07/06 09:22:04 wiz Exp $
 
-SHA1 (findlib-1.2.8.tar.gz) = 85d28df1a5a5c72a7a1b1c40ff89ea592507e6bd
-RMD160 (findlib-1.2.8.tar.gz) = 8b8c22c27cbdfa0a324d44480671d36d3c6eb2a8
-Size (findlib-1.2.8.tar.gz) = 163985 bytes
-SHA1 (patch-aa) = f11eb4120e6be80c2f225d4c2597c33aceefdce6
-SHA1 (patch-ab) = 043d43f04c61ced0f3f9f3b6d59f89e83d6a18ee
+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 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
+SHA1 (patch-src_findlib_Makefile) = 63231a25aca3043e1b50360ff578c62099842b62
diff --git a/devel/ocaml-findlib/patches/patch-aa b/devel/ocaml-findlib/patches/patch-Makefile
index fa2539b039c..f3fac26cc25 100644
--- a/devel/ocaml-findlib/patches/patch-aa
+++ b/devel/ocaml-findlib/patches/patch-Makefile
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2010/08/21 15:27:31 asau Exp $
+$NetBSD: patch-Makefile,v 1.1 2012/07/06 09:22:04 wiz Exp $
 
+make package support DESTDIR
 --- Makefile.orig	2010-08-17 22:50:28.000000000 +0400
 +++ Makefile	2010-08-21 19:10:59.000000000 +0400
 @@ -17,13 +17,13 @@
diff --git a/devel/ocaml-findlib/patches/patch-ab b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
index 3389d6aa702..a05a56a4f4a 100644
--- a/devel/ocaml-findlib/patches/patch-ab
+++ b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
@@ -1,30 +1,35 @@
-$NetBSD: patch-ab,v 1.1 2010/08/21 15:27:31 asau Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.1 2012/07/06 09:22:04 wiz 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 @@
+make package support DESTDIR
+--- src/findlib/Makefile.orig	2012-06-08 12:14:41.000000000 +0000
++++ src/findlib/Makefile
+@@ -79,22 +79,22 @@ clean:
  	  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)"
++	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)"
++	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)"
++	cp $$f "${DESTDIR}$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
+ 	if [ -d "$(OCAML_CORE_STDLIB)/compiler-libs" ]; then \
+ 	    cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
+ 	    cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
+ 	fi
  
  install-num-top:
 -	mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
-+	mkdir -p "$(DESTDIR)$(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"
++		"${DESTDIR}$(prefix)$(OCAML_SITELIB)/num-top"
  
  # Note: uninstall-num-top is part of the removal of the META files.