CVS commit: pkgsrc/devel/ocaml-findlib

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jul 31 09:07:00 UTC 2019

Modified Files:
        pkgsrc/devel/ocaml-findlib: Makefile distinfo
        pkgsrc/devel/ocaml-findlib/patches: patch-src_findlib_Makefile

Log Message:
Updated devel/ocaml-findlib to 1.8.1.

This fixes an issue with OCaml 4.09, and adds support for loading
packages by prefix.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/ocaml-findlib/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-findlib/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-findlib/Makefile
diff -u pkgsrc/devel/ocaml-findlib/Makefile:1.44 pkgsrc/devel/ocaml-findlib/Makefile:1.45
--- pkgsrc/devel/ocaml-findlib/Makefile:1.44    Thu May 23 19:22:58 2019
+++ pkgsrc/devel/ocaml-findlib/Makefile Wed Jul 31 09:07:00 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2019/05/23 19:22:58 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2019/07/31 09:07:00 jaapb Exp $
 
-DISTNAME=              findlib-1.8.0
+DISTNAME=              findlib-1.8.1
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           5
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 

Index: pkgsrc/devel/ocaml-findlib/distinfo
diff -u pkgsrc/devel/ocaml-findlib/distinfo:1.19 pkgsrc/devel/ocaml-findlib/distinfo:1.20
--- pkgsrc/devel/ocaml-findlib/distinfo:1.19    Tue May 14 15:55:44 2019
+++ pkgsrc/devel/ocaml-findlib/distinfo Wed Jul 31 09:07:00 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2019/05/14 15:55:44 jaapb Exp $
+$NetBSD: distinfo,v 1.20 2019/07/31 09:07:00 jaapb Exp $
 
-SHA1 (findlib-1.8.0.tar.gz) = 91fa957208a10c53420c30eb55d0a0c324070026
-RMD160 (findlib-1.8.0.tar.gz) = ad543ea9c62bfe4ca20389a7764ba0b03a0b3a3a
-SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48
-Size (findlib-1.8.0.tar.gz) = 260719 bytes
+SHA1 (findlib-1.8.1.tar.gz) = d3fe18a261c453176e67884b0b475c3a82b68397
+RMD160 (findlib-1.8.1.tar.gz) = ad880f92351ea31e3741b683d85d1fe04df387d2
+SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
+Size (findlib-1.8.1.tar.gz) = 261544 bytes
 SHA1 (patch-Makefile) = 72afa3c32f78183f745a63d2817fcf05154d27d3
 SHA1 (patch-configure) = ca920a5fa1596070d6e1ab26c69cbffa5678906a
-SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0
+SHA1 (patch-src_findlib_Makefile) = 5322bcda8cdab7fe2e54f1a1219b416fefb8b14a

Index: pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
diff -u pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.8 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.9
--- pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.8   Tue Jul 11 09:57:11 2017
+++ pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile       Wed Jul 31 09:07:00 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.8 2017/07/11 09:57:11 jaapb Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.9 2019/07/31 09:07:00 jaapb Exp $
 
 Install into DESTDIR, use BSD install commands
---- src/findlib/Makefile.orig  2017-05-21 14:26:17.000000000 +0000
+--- src/findlib/Makefile.orig  2019-07-29 12:06:35.000000000 +0000
 +++ src/findlib/Makefile
-@@ -119,23 +119,23 @@ clean:
+@@ -118,23 +118,23 @@ clean:
          ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
  
  install: all
@@ -13,7 +13,7 @@ Install into DESTDIR, use BSD install co
 +      $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +      $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +      test $(INSTALL_TOPFIND) -eq 0 || $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
-       files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs 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_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a 
findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+       files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs 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_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa 
findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
 -      cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +      $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
        f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \