[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Updated package to latest version, ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Updated package to latest version, ...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:29:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b3ab0d42cd4
branches:  trunk
changeset: 365115:9b3ab0d42cd4
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Jul 11 09:57:11 2017 +0000

description:
Updated package to latest version, 1.7.3. Apart from a pkgsrc patch that
allows for installation of .cmxs files, changes include:

1.7.3:
Fix regarding num-top: this library is now also optional, as num.

1.7.2:
Trying to protect against failures when several package installs are done in
parallel.

New subpackage "findlib.top" for the toploop (Jeremie Dimino).

The "num" library is now optional.

Shell scripts are started via "sh" command when there is no /bin/sh (ygrek)

diffstat:

 devel/ocaml-findlib/Makefile                           |   5 ++---
 devel/ocaml-findlib/buildlink3.mk                      |   4 ++--
 devel/ocaml-findlib/distinfo                           |  16 ++++++++--------
 devel/ocaml-findlib/files/ocamlfind.sh                 |  14 ++++++++++++--
 devel/ocaml-findlib/patches/patch-Makefile             |   6 +++---
 devel/ocaml-findlib/patches/patch-configure            |   8 ++++----
 devel/ocaml-findlib/patches/patch-src_findlib_Makefile |   6 +++---
 7 files changed, 34 insertions(+), 25 deletions(-)

diffs (148 lines):

diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/Makefile      Tue Jul 11 09:57:11 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2017/04/24 21:47:47 maya Exp $
+# $NetBSD: Makefile,v 1.33 2017/07/11 09:57:11 jaapb Exp $
 
-DISTNAME=              findlib-1.7.1
+DISTNAME=              findlib-1.7.3
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/buildlink3.mk
--- a/devel/ocaml-findlib/buildlink3.mk Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/buildlink3.mk Tue Jul 11 09:57:11 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2016/02/02 11:41:45 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2017/07/11 09:57:11 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-findlib
 
@@ -6,7 +6,7 @@
 OCAML_FINDLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.6
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.7.3
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=    ../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=    ocaml-findlib-wrappers ocaml-findlib-ldconf
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/distinfo      Tue Jul 11 09:57:11 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2016/11/30 13:46:14 wiz Exp $
+$NetBSD: distinfo,v 1.16 2017/07/11 09:57:11 jaapb Exp $
 
-SHA1 (findlib-1.7.1.tar.gz) = 5cde7077341a3ff9de7a625383f369b1e1d61fd3
-RMD160 (findlib-1.7.1.tar.gz) = 2d4dca216c58214e102ab35f604607d91a6f6c89
-SHA512 (findlib-1.7.1.tar.gz) = 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
-Size (findlib-1.7.1.tar.gz) = 256883 bytes
-SHA1 (patch-Makefile) = 7d427be437e4ec2fb50feba8dee7d2759506267b
-SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
-SHA1 (patch-src_findlib_Makefile) = f523a19a205257b320ebaab956b546659aa46ed4
+SHA1 (findlib-1.7.3.tar.gz) = 8a79a305ae76be1d2939ad7ffd3e59ddd93559ef
+RMD160 (findlib-1.7.3.tar.gz) = 2b6d492fa4416b597f639c7a8a40e6f1af094d6f
+SHA512 (findlib-1.7.3.tar.gz) = 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
+Size (findlib-1.7.3.tar.gz) = 257703 bytes
+SHA1 (patch-Makefile) = 72afa3c32f78183f745a63d2817fcf05154d27d3
+SHA1 (patch-configure) = 457b435a85b2575a3994cc99a5e913b02e458955
+SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/files/ocamlfind.sh
--- a/devel/ocaml-findlib/files/ocamlfind.sh    Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/files/ocamlfind.sh    Tue Jul 11 09:57:11 2017 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 
-# $NetBSD: ocamlfind.sh,v 1.5 2014/10/31 01:00:30 hiramatsu Exp $
+# $NetBSD: ocamlfind.sh,v 1.6 2017/07/11 09:57:11 jaapb Exp $
 
 if [ "$1" = install ]; then
        need_destdir=yes
@@ -21,5 +21,15 @@
        if [ "$need_ldconf" = "yes" ]; then
                set -- "$@" -ldconf "@BUILDLINK_DIR@/lib/ocaml/ld.conf"
        fi
+       exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"
+elif [ "$1" = printconf ]; then
+       if [ "$2" = destdir ]; then
+               ocamlfind="@OCAML_FINDLIB_PREFIX@/bin/`basename $0`"
+               dir=`"$ocamlfind" printconf destdir`
+               echo "@DESTDIR@$dir"
+       else
+               exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"
+       fi
+else
+       exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"
 fi
-exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/patches/patch-Makefile
--- a/devel/ocaml-findlib/patches/patch-Makefile        Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/patches/patch-Makefile        Tue Jul 11 09:57:11 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-Makefile,v 1.5 2016/11/30 13:46:14 wiz Exp $
+$NetBSD: patch-Makefile,v 1.6 2017/07/11 09:57:11 jaapb Exp $
 
 make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
---- Makefile.orig      2016-11-18 13:04:45.000000000 +0000
+--- Makefile.orig      2017-06-05 14:32:28.000000000 +0000
 +++ Makefile
 @@ -17,14 +17,14 @@ opt:
        for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
@@ -14,7 +14,7 @@
        $(MAKE) install-config
        for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
        $(MAKE) install-meta
-       cd src/findlib; $(MAKE) install-num-top
+       test -z "$(NUMTOP)" || { cd src/findlib; $(MAKE) install-num-top; }
        if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
 -              cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
 +              $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure       Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Tue Jul 11 09:57:11 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.2 2014/10/09 20:53:15 jaapb Exp $
+$NetBSD: patch-configure,v 1.3 2017/07/11 09:57:11 jaapb Exp $
 
 Do not install dbm META file even if dbm is present
---- configure.orig     2014-09-16 11:21:45.000000000 +0000
+--- configure.orig     2017-05-21 14:26:16.000000000 +0000
 +++ configure
-@@ -479,13 +479,13 @@ fi
+@@ -514,13 +514,13 @@ fi
  
  # dbm?
  
@@ -21,5 +21,5 @@
 -fi
 +#fi
  
- # bytes?
+ # num?
  
diff -r ff11dd2f47b3 -r 9b3ab0d42cd4 devel/ocaml-findlib/patches/patch-src_findlib_Makefile
--- a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile    Tue Jul 11 09:54:21 2017 +0000
+++ b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile    Tue Jul 11 09:57:11 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.7 2016/11/30 13:46:14 wiz Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.8 2017/07/11 09:57:11 jaapb Exp $
 
 Install into DESTDIR, use BSD install commands
---- src/findlib/Makefile.orig  2016-11-18 13:04:46.000000000 +0000
+--- src/findlib/Makefile.orig  2017-05-21 14:26:17.000000000 +0000
 +++ src/findlib/Makefile
 @@ -119,23 +119,23 @@ clean:
          ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
@@ -13,7 +13,7 @@
 +      $(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=`$(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.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` && \
 -      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)"; }; \
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/ocaml-findlib to 1.7.3
Next by Date: [pkgsrc/trunk]: pkgsrc/misc Added ocaml-topkg to Makefile SUBDIRs
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/ocaml-findlib to 1.7.3
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc Added ocaml-topkg to Makefile SUBDIRs
Indexes:
Home | Main Index | Thread Index | Old Index