[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib ocaml-findlib: update to 1.9.6.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib ocaml-findlib: update to 1.9.6.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Mon, 09 Jan 2023 15:52:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5887c22b705
branches:  trunk
changeset: 391529:c5887c22b705
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 09 14:24:40 2023 +0000

description:
ocaml-findlib: update to 1.9.6.

Summary of changes not found, 9 months of commits.

diffstat:

 devel/ocaml-findlib/Makefile                                   |  14 +--
 devel/ocaml-findlib/distinfo                                   |  14 +-
 devel/ocaml-findlib/patches/patch-Makefile                     |  51 ----------
 devel/ocaml-findlib/patches/patch-configure                    |   8 +-
 devel/ocaml-findlib/patches/patch-src_bytes_Makefile           |  19 ---
 devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile |  15 --
 devel/ocaml-findlib/patches/patch-src_findlib_Makefile         |  43 --------
 7 files changed, 12 insertions(+), 152 deletions(-)

diffs (226 lines):

diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Mon Jan 09 14:12:58 2023 +0000
+++ b/devel/ocaml-findlib/Makefile      Mon Jan 09 14:24:40 2023 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2022/05/24 18:51:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.54 2023/01/09 14:24:40 wiz Exp $
 
-DISTNAME=              findlib-1.9.3
+DISTNAME=              findlib-1.9.6
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 
@@ -16,13 +15,6 @@
 
 .include "../../lang/ocaml/ocaml.mk"
 
-# spacetime profiling is only available for native code on 64bit platforms
-PLIST_VARS+=           64bit
-.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
-    (defined(ABI) && ${ABI} == "64")
-PLIST.64bit=           yes
-.endif
-
 # Undeclared dependencies between different components
 MAKE_JOBS_SAFE=                no
 
@@ -42,7 +34,6 @@
 
 EGDIR=                 ${PREFIX}/share/examples/ocaml-findlib
 INSTALL_MAKE_FLAGS+=   OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
-INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}
 INSTALLATION_DIRS=     lib/ocaml libexec bin ${OCAML_SITELIBDIR}
 
 CONF_FILES=            ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
@@ -54,6 +45,7 @@
 SUBST_FILES.pathes=    ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config
 SUBST_SED.pathes=      -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin','
 
+# needs to be installed first
 do-test:
        ${RUN} cd ${WRKSRC}; ${SH} itest
 
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Mon Jan 09 14:12:58 2023 +0000
+++ b/devel/ocaml-findlib/distinfo      Mon Jan 09 14:24:40 2023 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.26 2022/02/02 14:45:18 wiz Exp $
+$NetBSD: distinfo,v 1.27 2023/01/09 14:24:40 wiz Exp $
 
-BLAKE2s (findlib-1.9.3.tar.gz) = ecc66e99df2a15c186c0635fff7eeb20ce8108b024cd10e2c53affc79da0cf3c
-SHA512 (findlib-1.9.3.tar.gz) = 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea
-Size (findlib-1.9.3.tar.gz) = 264132 bytes
-SHA1 (patch-Makefile) = 6db7caae07e812fe8e116c9e76710838f7df3bfc
-SHA1 (patch-configure) = b5730cab9598dda0a1f12ea77474612fe580e4ab
-SHA1 (patch-src_bytes_Makefile) = 6cba1af5bb70bb66bf29d906484081a2f8aa8433
-SHA1 (patch-src_findlib-toolbox_Makefile) = 71830cf8412d446a081b0e318b2a38dac64764c2
-SHA1 (patch-src_findlib_Makefile) = b9583b443ff51f4fd92896b60b0e9d48b021a459
+BLAKE2s (findlib-1.9.6.tar.gz) = 8c1c16553033138002421eba970a1173e38703202a5b803bbcd93e12865692a4
+SHA512 (findlib-1.9.6.tar.gz) = cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027
+Size (findlib-1.9.6.tar.gz) = 271246 bytes
+SHA1 (patch-configure) = e46298785a529b689cbe9b7757d12487ce3a2c5c
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/patches/patch-Makefile
--- a/devel/ocaml-findlib/patches/patch-Makefile        Mon Jan 09 14:12:58 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-Makefile,v 1.9 2022/02/02 14:45:18 wiz Exp $
-
-use BSD_INSTALL_* instead of mkdir and cp
-
---- Makefile.orig      2022-01-24 14:15:03.000000000 +0000
-+++ Makefile
-@@ -24,7 +24,7 @@ install: check-installation
-       for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
-       $(MAKE) install-meta
-       test ! -f 'site-lib-src/num-top/META' || { cd src/findlib; $(MAKE) install-num-top; }
--      test ! -f 'site-lib-src/camlp4/META' || cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
-+      test ! -f 'site-lib-src/camlp4/META' || $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
-       $(MAKE) install-doc
- 
- uninstall: check-installation
-@@ -70,9 +70,9 @@ findlib.conf: findlib.conf.in
- 
- .PHONY: install-doc
- install-doc:
--      mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
--      -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
--      -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
-+      $(BSD_INSTALL_MAN_DIR) "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
-+      -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
-+      -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
- 
- .PHONY: uninstall-doc
- uninstall-doc:
-@@ -102,8 +102,8 @@ check-installation:
- 
- .PHONY: install-meta
- install-meta:
--      for x in $(SITELIB_META); do mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" && mv "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" 
"$(prefix)$(OCAML_SITELIB)/$$x/META"; done
--      mkdir -p "$(prefix)$(OCAML_SITELIB)/findlib"; cp Makefile.packages "$(prefix)$(OCAML_SITELIB)/findlib/Makefile.packages"
-+      for x in $(SITELIB_META); do $(BSD_INSTALL_LIB_DIR) -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" && mv 
"$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" "$(prefix)$(OCAML_SITELIB)/$$x/META"; done
-+      $(BSD_INSTALL_LIB_DIR) -p "$(prefix)$(OCAML_SITELIB)/findlib"; $(BSD_INSTALL_DATA) Makefile.packages "$(prefix)$(OCAML_SITELIB)/findlib/Makefile.packages"
- 
- .PHONY: uninstall-meta
- uninstall-meta:
-@@ -111,9 +111,9 @@ uninstall-meta:
- 
- .PHONY: install-config
- install-config:
--      mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
-+      $(BSD_INSTALL_DATA_DIR) "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
-       @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
--      test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
-+      test -f "$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
- 
- .PHONY: uninstall-config
- uninstall-config:
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure       Mon Jan 09 14:12:58 2023 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Mon Jan 09 14:24:40 2023 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.7 2021/03/18 08:30:43 jaapb Exp $
+$NetBSD: patch-configure,v 1.8 2023/01/09 14:24:40 wiz Exp $
 
 Do not install META files for libraries that were split off
 
---- configure.orig     2021-03-16 11:43:00.000000000 +0000
+--- configure.orig     2023-01-09 14:18:01.493625801 +0000
 +++ configure
-@@ -511,10 +511,10 @@ fi
- 
+@@ -555,10 +555,10 @@ fi
+ check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi
  check_library bigarray 'possible since 4.08'
  check_library compiler-libs '' 'compiler-libs'
 -check_library dbm 'normal since 4.00'
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/patches/patch-src_bytes_Makefile
--- a/devel/ocaml-findlib/patches/patch-src_bytes_Makefile      Mon Jan 09 14:12:58 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_bytes_Makefile,v 1.3 2022/02/02 14:35:34 wiz Exp $
-
-use BSD install commands
-
---- src/bytes/Makefile.orig    2022-01-19 22:39:27.000000000 +0000
-+++ src/bytes/Makefile
-@@ -20,9 +20,9 @@ opt:
-       fi
- 
- install: all
--      mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes"
--      cp META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
--      for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
-+      $(BSD_INSTALL_LIB_DIR) -p "$(prefix)$(OCAML_SITELIB)/bytes"
-+      $(BSD_INSTALL_DATA) META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
-+      for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then $(BSD_INSTALL_LIB) $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
- 
- uninstall: 
-       rm -rf "$(prefix)$(OCAML_SITELIB)/bytes"
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile
--- a/devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile    Mon Jan 09 14:12:58 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_findlib-toolbox_Makefile,v 1.2 2022/02/02 14:35:34 wiz Exp $
-
-use BSD install commands
-
---- src/findlib-toolbox/Makefile.orig  2022-01-19 22:39:27.000000000 +0000
-+++ src/findlib-toolbox/Makefile
-@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
-               findlib.cma make_wizard.ml
- 
- install:
--      cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
-+      $(BSD_INSTALL_SCRIPT) make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
- 
- # uninstall: Nothing to do, because the removal of the findlib core also
- # deinstalls the make_wizard
diff -r 95cdc63bdf0b -r c5887c22b705 devel/ocaml-findlib/patches/patch-src_findlib_Makefile
--- a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile    Mon Jan 09 14:12:58 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.12 2022/02/02 14:45:18 wiz Exp $
-
-use BSD install commands
-
---- src/findlib/Makefile.orig  2022-01-24 14:15:03.000000000 +0000
-+++ src/findlib/Makefile
-@@ -121,9 +121,9 @@ 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)"
-+      $(BSD_INSTALL_DATA_DIR) "$(prefix)$(OCAML_SITELIB)/$(NAME)"
-+      $(BSD_INSTALL_PROGRAM_DIR) "$(prefix)$(OCAMLFIND_BIN)"
-+      test $(INSTALL_TOPFIND) -eq 0 || $(BSD_INSTALL_SCRIPT) topfind "$(prefix)$(OCAML_CORE_STDLIB)"
-       files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \
-       findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \
-       findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \
-@@ -132,18 +132,18 @@ install: all
-       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 "$(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)"
-+      $(BSD_INSTALL_SCRIPT) $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
-       # the following "if" block is only needed for 4.00beta2
-       if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
-           cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
--          cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
-+          $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
-       fi
- 
- install-num-top:
--      mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
--      cp num_top.cma num_top.cmi num_top_printers.cmi \
-+      $(BSD_INSTALL_DATA_DIR) "$(prefix)$(OCAML_SITELIB)/num-top"
-+      $(BSD_INSTALL_DATA) num_top.cma num_top.cmi num_top_printers.cmi \
-               "$(prefix)$(OCAML_SITELIB)/num-top"
- 
- # Note: uninstall-num-top is part of the removal of the META files.
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-findlib to 1.9.6
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/inetutils to 2.4
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-findlib to 1.9.6
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/inetutils to 2.4
Indexes:
Home | Main Index | Thread Index | Old Index