CVS commit: pkgsrc/devel/ocaml-findlib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan  9 14:24:40 UTC 2023

Modified Files:
        pkgsrc/devel/ocaml-findlib: Makefile distinfo
        pkgsrc/devel/ocaml-findlib/patches: patch-configure
Removed Files:
        pkgsrc/devel/ocaml-findlib/patches: patch-Makefile
            patch-src_bytes_Makefile patch-src_findlib-toolbox_Makefile
            patch-src_findlib_Makefile

Log Message:
ocaml-findlib: update to 1.9.6.

Summary of changes not found, 9 months of commits.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/ocaml-findlib/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/ocaml-findlib/distinfo
cvs rdiff -u -r1.9 -r0 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/patches/patch-configure
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/ocaml-findlib/patches/patch-src_bytes_Makefile
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile
cvs rdiff -u -r1.12 -r0 \
    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.53 pkgsrc/devel/ocaml-findlib/Makefile:1.54
--- pkgsrc/devel/ocaml-findlib/Makefile:1.53    Tue May 24 18:51:49 2022
+++ pkgsrc/devel/ocaml-findlib/Makefile Mon Jan  9 14:24:40 2023
@@ -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 @@ OCAML_FINDLIB_DIRS+= bigarray bytes comp
 
 .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 @@ BUILD_TARGET+=        opt
 
 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_STAGE.pathes=   post-install
 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
 

Index: pkgsrc/devel/ocaml-findlib/distinfo
diff -u pkgsrc/devel/ocaml-findlib/distinfo:1.26 pkgsrc/devel/ocaml-findlib/distinfo:1.27
--- pkgsrc/devel/ocaml-findlib/distinfo:1.26    Wed Feb  2 14:45:18 2022
+++ pkgsrc/devel/ocaml-findlib/distinfo Mon Jan  9 14:24:40 2023
@@ -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

Index: pkgsrc/devel/ocaml-findlib/patches/patch-configure
diff -u pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.7 pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.8
--- pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.7      Thu Mar 18 08:30:43 2021
+++ pkgsrc/devel/ocaml-findlib/patches/patch-configure  Mon Jan  9 14:24:40 2023
@@ -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'