Fri Jul 5 13:57:58 2013 UTC ()
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.


(jaapb)
diff -r1.15 -r1.16 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
cvs diff -r1.15 -r1.16 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2012/10/31 11:17:33 1.15
+++ pkgsrc/devel/ocaml-findlib/Makefile 2013/07/05 13:57:58 1.16
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.15 2012/10/31 11:17:33 asau Exp $ 1# $NetBSD: Makefile,v 1.16 2013/07/05 13:57:58 jaapb Exp $
2# 2#
3 3
4DISTNAME= findlib-1.3.3 4DISTNAME= findlib-1.4
5PKGNAME= ocaml-${DISTNAME} 5PKGNAME= ocaml-${DISTNAME}
6PKGREVISION= 1 
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= http://download.camlcity.org/download/ 7MASTER_SITES= http://download.camlcity.org/download/
9 8
10MAINTAINER= jaapb@kerguelen.org 9MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://www.camlcity.org/ 10HOMEPAGE= http://www.camlcity.org/
12COMMENT= Library finder for OCaml 11COMMENT= Library finder for OCaml
13LICENSE= mit 12LICENSE= mit
14 13
15USE_TOOLS+= gmake m4 bash 14USE_TOOLS+= gmake m4 bash
16USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
17HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
18MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
19CONFIGURE_ARGS+= -bindir ${PREFIX}/bin 18CONFIGURE_ARGS+= -bindir ${PREFIX}/bin
20CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 19CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
21CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf 20CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf
22CONFIGURE_ARGS+= -sitelib ${PREFIX}/lib/ocaml/site-lib 21CONFIGURE_ARGS+= -sitelib ${PREFIX}/lib/ocaml/site-lib
23 22
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2012/08/14 06:56:21 1.6
+++ pkgsrc/devel/ocaml-findlib/distinfo 2013/07/05 13:57:58 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2012/08/14 06:56:21 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2013/07/05 13:57:58 jaapb Exp $
2 2
3SHA1 (findlib-1.3.3.tar.gz) = 5d1a52b77145348ded29fefe13736694aabb1868 3SHA1 (findlib-1.4.tar.gz) = 07048076758e4ca892f06ff535d7cab033833bde
4RMD160 (findlib-1.3.3.tar.gz) = 1a13d069d8dc2140c81d22205cf5b06e727d85c4 4RMD160 (findlib-1.4.tar.gz) = ab81e1521fe51ab69427d791347ad21ad404855a
5Size (findlib-1.3.3.tar.gz) = 231414 bytes 5Size (findlib-1.4.tar.gz) = 231526 bytes
6SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823 6SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
7SHA1 (patch-src_findlib_Makefile) = adddf9a10429da4a09794c22dc7046fa91a0befe 7SHA1 (patch-src_findlib_Makefile) = be49342260bd27365716f5a05632c98904533276
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2012/08/14 06:56:21 1.2
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2013/07/05 13:57:58 1.3
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1$NetBSD: patch-src_findlib_Makefile,v 1.2 2012/08/14 06:56:21 wiz Exp $ 1$NetBSD: patch-src_findlib_Makefile,v 1.3 2013/07/05 13:57:58 jaapb Exp $
2 2
3make package support DESTDIR 3Install into DESTDIR, use BSD install commands
4--- src/findlib/Makefile.orig 2012-07-09 09:29:16.000000000 +0000 4--- src/findlib/Makefile.orig 2013-06-11 07:27:39.000000000 +0000
5+++ src/findlib/Makefile 5+++ src/findlib/Makefile
6@@ -80,23 +80,24 @@ clean: 6@@ -84,23 +84,24 @@ clean:
7 ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) 7 #rm -f ocaml_args.ml
8  8
9 install: all 9 install: all
10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" 10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" 12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
13+ mkdir -p "${DESTDIR}$(prefix)$(OCAML_SITELIB)/$(NAME)" 13+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
14+ mkdir -p "${DESTDIR}$(prefix)$(OCAMLFIND_BIN)" 14+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
15+ test $(INSTALL_TOPFIND) -eq 0 || \ 15+ test $(INSTALL_TOPFIND) -eq 0 || \
16+ cp topfind "${DESTDIR}$(prefix)$(OCAML_CORE_STDLIB)" 16+ $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
17 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` && \ 17 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` && \
18- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" 18- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
19+ cp $$files "${DESTDIR}$(prefix)$(OCAML_SITELIB)/$(NAME)" 19+ $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
20 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ 20 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
21- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 21- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
22+ cp $$f "${DESTDIR}$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 22+ $(BSD_INSTALL_SCRIPT) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
23 # the following "if" block is only needed for 4.00beta2 23 # the following "if" block is only needed for 4.00beta2
24 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ 24 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
25 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ 25 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
26- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 26- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
27+ cp topdirs.cmi toploop.cmi "${DESTDIR}$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 27+ $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
28 fi 28 fi
29  29
30 install-num-top: 30 install-num-top:
31- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top" 31- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
32+ mkdir -p "${DESTDIR}$(prefix)$(OCAML_SITELIB)/num-top" 32- cp num_top.cma num_top.cmi num_top_printers.cmi \
33 cp num_top.cma num_top.cmi num_top_printers.cmi \ 
34- "$(prefix)$(OCAML_SITELIB)/num-top" 33- "$(prefix)$(OCAML_SITELIB)/num-top"
35+ "${DESTDIR}$(prefix)$(OCAML_SITELIB)/num-top" 34+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
 35+ $(BSD_INSTALL_DATA) num_top.cma num_top.cmi num_top_printers.cmi \
 36+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
36  37
37 # Note: uninstall-num-top is part of the removal of the META files. 38 # Note: uninstall-num-top is part of the removal of the META files.
38  39