Thu May 5 09:42:19 2016 UTC ()
Updated package to latest version, 1.6.2. Changes include:
Uninstalling findlib no longer uninstalls the ocamlbuild library by accident
(Gabriel Scherer, Edwin T旦r旦k)
Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins
(suggested by Arma谷l Gu辿neau)
Support for OCaml-4.03: recognize that the new -color option has an argument
(reported by Guillaume Bury)


(jaapb)
diff -r1.27 -r1.28 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/ocaml-findlib/PLIST
diff -r1.13 -r1.14 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
cvs diff -r1.27 -r1.28 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2016/04/30 20:16:11 1.27
+++ pkgsrc/devel/ocaml-findlib/Makefile 2016/05/05 09:42:19 1.28
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.27 2016/04/30 20:16:11 joerg Exp $ 1# $NetBSD: Makefile,v 1.28 2016/05/05 09:42:19 jaapb Exp $
2 2
3DISTNAME= findlib-1.6.1 3DISTNAME= findlib-1.6.2
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://download.camlcity.org/download/ 6MASTER_SITES= http://download.camlcity.org/download/
7 7
8MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://www.camlcity.org/ 9HOMEPAGE= http://www.camlcity.org/
10COMMENT= Library finder for OCaml 10COMMENT= Library finder for OCaml
11LICENSE= mit 11LICENSE= mit
12 12
13.include "../../mk/ocaml.mk" 13.include "../../mk/ocaml.mk"
14 14
15# Undeclared dependencies between different components 15# Undeclared dependencies between different components
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
cvs diff -r1.9 -r1.10 pkgsrc/devel/ocaml-findlib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/PLIST 2016/02/02 11:41:45 1.9
+++ pkgsrc/devel/ocaml-findlib/PLIST 2016/05/05 09:42:19 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2016/02/02 11:41:45 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.10 2016/05/05 09:42:19 jaapb Exp $
2bin/ocamlfind 2bin/ocamlfind
3${OCAML_SITELIB}/bigarray/META 3${OCAML_SITELIB}/bigarray/META
4${OCAML_SITELIB}/bytes/META 4${OCAML_SITELIB}/bytes/META
5${OCAML_SITELIB}/compiler-libs/META 5${OCAML_SITELIB}/compiler-libs/META
6${OCAML_SITELIB}/dynlink/META 6${OCAML_SITELIB}/dynlink/META
7${OCAML_SITELIB}/findlib/META 7${OCAML_SITELIB}/findlib/META
8${OCAML_SITELIB}/findlib/Makefile.config 8${OCAML_SITELIB}/findlib/Makefile.config
9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a 9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
10${OCAML_SITELIB}/findlib/findlib.cma 10${OCAML_SITELIB}/findlib/findlib.cma
11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa 11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs 12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs
13${OCAML_SITELIB}/findlib/findlib.cmi 13${OCAML_SITELIB}/findlib/findlib.cmi
14${OCAML_SITELIB}/findlib/findlib.mli 14${OCAML_SITELIB}/findlib/findlib.mli
@@ -17,30 +17,30 @@ ${OCAML_SITELIB}/findlib/findlib_dynload @@ -17,30 +17,30 @@ ${OCAML_SITELIB}/findlib/findlib_dynload
17${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxa 17${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxa
18${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxs 18${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxs
19${OCAML_SITELIB}/findlib/findlib_top.cma 19${OCAML_SITELIB}/findlib/findlib_top.cma
20${OCAML_SITELIB}/findlib/fl_dynload.cmi 20${OCAML_SITELIB}/findlib/fl_dynload.cmi
21${OCAML_SITELIB}/findlib/fl_dynload.mli 21${OCAML_SITELIB}/findlib/fl_dynload.mli
22${OCAML_SITELIB}/findlib/fl_metascanner.cmi 22${OCAML_SITELIB}/findlib/fl_metascanner.cmi
23${OCAML_SITELIB}/findlib/fl_metascanner.mli 23${OCAML_SITELIB}/findlib/fl_metascanner.mli
24${OCAML_SITELIB}/findlib/fl_metatoken.cmi 24${OCAML_SITELIB}/findlib/fl_metatoken.cmi
25${OCAML_SITELIB}/findlib/fl_package_base.cmi 25${OCAML_SITELIB}/findlib/fl_package_base.cmi
26${OCAML_SITELIB}/findlib/fl_package_base.mli 26${OCAML_SITELIB}/findlib/fl_package_base.mli
27${OCAML_SITELIB}/findlib/topfind.cmi 27${OCAML_SITELIB}/findlib/topfind.cmi
28${OCAML_SITELIB}/findlib/topfind.mli 28${OCAML_SITELIB}/findlib/topfind.mli
29${OCAML_SITELIB}/graphics/META 29${OCAML_SITELIB}/graphics/META
 30${OCAML_SITELIB}/ocamldoc/META
30${OCAML_SITELIB}/num-top/META 31${OCAML_SITELIB}/num-top/META
31${OCAML_SITELIB}/num-top/num_top.cma 32${OCAML_SITELIB}/num-top/num_top.cma
32${OCAML_SITELIB}/num-top/num_top.cmi 33${OCAML_SITELIB}/num-top/num_top.cmi
33${OCAML_SITELIB}/num-top/num_top_printers.cmi 34${OCAML_SITELIB}/num-top/num_top_printers.cmi
34${OCAML_SITELIB}/num/META 35${OCAML_SITELIB}/num/META
35${OCAML_SITELIB}/ocamlbuild/META 
36${OCAML_SITELIB}/stdlib/META 36${OCAML_SITELIB}/stdlib/META
37${OCAML_SITELIB}/str/META 37${OCAML_SITELIB}/str/META
38${OCAML_SITELIB}/threads/META 38${OCAML_SITELIB}/threads/META
39${OCAML_SITELIB}/unix/META 39${OCAML_SITELIB}/unix/META
40lib/ocaml/topfind 40lib/ocaml/topfind
41libexec/ocaml-findlib-register 41libexec/ocaml-findlib-register
42@comment man/man1/ocamlfind.1 42@comment man/man1/ocamlfind.1
43@comment man/man5/META.5 43@comment man/man5/META.5
44@comment man/man5/findlib.conf.5 44@comment man/man5/findlib.conf.5
45@comment man/man5/site-lib.5 45@comment man/man5/site-lib.5
46share/examples/ocaml-findlib/ocamlfind.conf 46share/examples/ocaml-findlib/ocamlfind.conf
cvs diff -r1.13 -r1.14 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2016/02/02 11:41:45 1.13
+++ pkgsrc/devel/ocaml-findlib/distinfo 2016/05/05 09:42:19 1.14
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.13 2016/02/02 11:41:45 jaapb Exp $ 1$NetBSD: distinfo,v 1.14 2016/05/05 09:42:19 jaapb Exp $
2 2
3SHA1 (findlib-1.6.1.tar.gz) = ca84a83c4e64e1d2823386c3880cc11b00c99c39 3SHA1 (findlib-1.6.2.tar.gz) = 25da312f0a0013fe04ebe0577594e8bc9e7f5d64
4RMD160 (findlib-1.6.1.tar.gz) = aeec03730ef05c161e9ce7d06283ab56aecb1358 4RMD160 (findlib-1.6.2.tar.gz) = b6d448a5266254b3bfeceb8ca445e454291007fb
5SHA512 (findlib-1.6.1.tar.gz) = b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8 5SHA512 (findlib-1.6.2.tar.gz) = 8c4098e6956530bc88d20a1b91512c68368e8a866398ce4d504afe3f71e81124c01644ba31ff97da6e61e7410328b533fb1d31a513166231047dab1933179fc4
6Size (findlib-1.6.1.tar.gz) = 254797 bytes 6Size (findlib-1.6.2.tar.gz) = 253764 bytes
7SHA1 (patch-Makefile) = 823c52a1b581c36f1d097289bf15750ae9e41199 7SHA1 (patch-Makefile) = c1688615027f5f0f67a738c15ddd44a31a77ffdf
8SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881 8SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
9SHA1 (patch-src_findlib_Makefile) = 0fc2570c4d2cb271bbd8a872d8331b3d3edcbc7c 9SHA1 (patch-src_findlib_Makefile) = 0fc2570c4d2cb271bbd8a872d8331b3d3edcbc7c
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2016/02/02 11:41:46 1.3
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2016/05/05 09:42:19 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-Makefile,v 1.3 2016/02/02 11:41:46 jaapb Exp $ 1$NetBSD: patch-Makefile,v 1.4 2016/05/05 09:42:19 jaapb Exp $
2 2
3make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp 3make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
4--- Makefile.orig 2015-12-07 14:35:24.000000000 +0000 4--- Makefile.orig 2016-03-07 13:46:34.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -17,14 +17,14 @@ opt: 6@@ -17,14 +17,14 @@ opt:
7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done 7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
8  8
9 install: 9 install:
10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
12+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 12+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
13+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)" 13+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
14 $(MAKE) install-config 14 $(MAKE) install-config
15 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done 15 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
16 $(MAKE) install-meta 16 $(MAKE) install-meta
17 cd src/findlib; $(MAKE) install-num-top 17 cd src/findlib; $(MAKE) install-num-top
@@ -28,28 +28,28 @@ make package support DESTDIR; use BSD_IN @@ -28,28 +28,28 @@ make package support DESTDIR; use BSD_IN
28- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" 28- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
29- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" 29- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
30- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" 30- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
31+ $(BSD_INSTALL_MAN_DIR( "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" 31+ $(BSD_INSTALL_MAN_DIR( "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
32+ -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" 32+ -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
33+ -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" 33+ -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
34  34
35 .PHONY: uninstall-doc 35 .PHONY: uninstall-doc
36 uninstall-doc: 36 uninstall-doc:
37@@ -86,7 +86,7 @@ uninstall-doc: 37@@ -86,7 +86,7 @@ uninstall-doc:
38  38
39 .PHONY: install-meta 39 .PHONY: install-meta
40 install-meta: 40 install-meta:
41- 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 41- for x in `ls site-lib-src`; do if [ -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
42+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done 42+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
43  43
44 .PHONY: uninstall-meta 44 .PHONY: uninstall-meta
45 uninstall-meta: 45 uninstall-meta:
46@@ -94,9 +94,9 @@ uninstall-meta: 46@@ -94,9 +94,9 @@ uninstall-meta:
47  47
48 .PHONY: install-config 48 .PHONY: install-config
49 install-config: 49 install-config:
50- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" 50- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
51- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi 51- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
52- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)" 52- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
53+ $(BSD_INSTALL_DATA_DIR) "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`" 53+ $(BSD_INSTALL_DATA_DIR) "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
54+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi 54+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
55+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" 55+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"