Mon Jan 9 14:24:40 2023 UTC ()
ocaml-findlib: update to 1.9.6.

Summary of changes not found, 9 months of commits.


(wiz)
diff -r1.53 -r1.54 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.26 -r1.27 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.9 -r0 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
diff -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/patches/patch-configure
diff -r1.3 -r0 pkgsrc/devel/ocaml-findlib/patches/patch-src_bytes_Makefile
diff -r1.2 -r0 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile
diff -r1.12 -r0 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
cvs diff -r1.53 -r1.54 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2022/05/24 18:51:49 1.53
+++ pkgsrc/devel/ocaml-findlib/Makefile 2023/01/09 14:24:40 1.54
@@ -1,60 +1,52 @@ @@ -1,60 +1,52 @@
1# $NetBSD: Makefile,v 1.53 2022/05/24 18:51:49 jaapb Exp $ 1# $NetBSD: Makefile,v 1.54 2023/01/09 14:24:40 wiz Exp $
2 2
3DISTNAME= findlib-1.9.3 3DISTNAME= findlib-1.9.6
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://download.camlcity.org/download/ 6MASTER_SITES= http://download.camlcity.org/download/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://projects.camlcity.org/projects/findlib.html 9HOMEPAGE= http://projects.camlcity.org/projects/findlib.html
11COMMENT= Library finder for OCaml 10COMMENT= Library finder for OCaml
12LICENSE= mit 11LICENSE= mit
13 12
14OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib \ 13OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib \
15 ocamldoc stdlib str threads unix 14 ocamldoc stdlib str threads unix
16 15
17.include "../../lang/ocaml/ocaml.mk" 16.include "../../lang/ocaml/ocaml.mk"
18 17
19# spacetime profiling is only available for native code on 64bit platforms 
20PLIST_VARS+= 64bit 
21.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ 
22 (defined(ABI) && ${ABI} == "64") 
23PLIST.64bit= yes 
24.endif 
25 
26# Undeclared dependencies between different components 18# Undeclared dependencies between different components
27MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
28 20
29USE_TOOLS+= gmake m4 bash fgrep:run sh:run 21USE_TOOLS+= gmake m4 bash fgrep:run sh:run
30USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
31HAS_CONFIGURE= yes 23HAS_CONFIGURE= yes
32CONFIGURE_ARGS+= -bindir ${PREFIX}/bin 24CONFIGURE_ARGS+= -bindir ${PREFIX}/bin
33CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 25CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
34CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf 26CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf
35CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR} 27CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR}
36CONFIGURE_ARGS+= -no-camlp4 28CONFIGURE_ARGS+= -no-camlp4
37 29
38BUILD_TARGET= all 30BUILD_TARGET= all
39.if ${OCAML_USE_OPT_COMPILER} == "yes" 31.if ${OCAML_USE_OPT_COMPILER} == "yes"
40BUILD_TARGET+= opt 32BUILD_TARGET+= opt
41.endif 33.endif
42 34
43EGDIR= ${PREFIX}/share/examples/ocaml-findlib 35EGDIR= ${PREFIX}/share/examples/ocaml-findlib
44INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf 36INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
45INSTALL_MAKE_FLAGS+= prefix=${DESTDIR} 
46INSTALLATION_DIRS= lib/ocaml libexec bin ${OCAML_SITELIBDIR} 37INSTALLATION_DIRS= lib/ocaml libexec bin ${OCAML_SITELIBDIR}
47 38
48CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf 39CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
49 40
50FILES_SUBST+= OCAML_FINDLIB_DIRS="${OCAML_FINDLIB_DIRS}" OCAML_SITELIBDIR="${OCAML_SITELIBDIR}" 41FILES_SUBST+= OCAML_FINDLIB_DIRS="${OCAML_FINDLIB_DIRS}" OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
51 42
52SUBST_CLASSES+= pathes 43SUBST_CLASSES+= pathes
53SUBST_STAGE.pathes= post-install 44SUBST_STAGE.pathes= post-install
54SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config 45SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config
55SUBST_SED.pathes= -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin',' 46SUBST_SED.pathes= -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin','
56 47
 48# needs to be installed first
57do-test: 49do-test:
58 ${RUN} cd ${WRKSRC}; ${SH} itest 50 ${RUN} cd ${WRKSRC}; ${SH} itest
59 51
60.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2022/02/02 14:45:18 1.26
+++ pkgsrc/devel/ocaml-findlib/distinfo 2023/01/09 14:24:40 1.27
@@ -1,10 +1,6 @@ @@ -1,10 +1,6 @@
1$NetBSD: distinfo,v 1.26 2022/02/02 14:45:18 wiz Exp $ 1$NetBSD: distinfo,v 1.27 2023/01/09 14:24:40 wiz Exp $
2 2
3BLAKE2s (findlib-1.9.3.tar.gz) = ecc66e99df2a15c186c0635fff7eeb20ce8108b024cd10e2c53affc79da0cf3c 3BLAKE2s (findlib-1.9.6.tar.gz) = 8c1c16553033138002421eba970a1173e38703202a5b803bbcd93e12865692a4
4SHA512 (findlib-1.9.3.tar.gz) = 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea 4SHA512 (findlib-1.9.6.tar.gz) = cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027
5Size (findlib-1.9.3.tar.gz) = 264132 bytes 5Size (findlib-1.9.6.tar.gz) = 271246 bytes
6SHA1 (patch-Makefile) = 6db7caae07e812fe8e116c9e76710838f7df3bfc 6SHA1 (patch-configure) = e46298785a529b689cbe9b7757d12487ce3a2c5c
7SHA1 (patch-configure) = b5730cab9598dda0a1f12ea77474612fe580e4ab 
8SHA1 (patch-src_bytes_Makefile) = 6cba1af5bb70bb66bf29d906484081a2f8aa8433 
9SHA1 (patch-src_findlib-toolbox_Makefile) = 71830cf8412d446a081b0e318b2a38dac64764c2 
10SHA1 (patch-src_findlib_Makefile) = b9583b443ff51f4fd92896b60b0e9d48b021a459 
File Deleted: pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/patch-configure 2021/03/18 08:30:43 1.7
+++ pkgsrc/devel/ocaml-findlib/patches/patch-configure 2023/01/09 14:24:40 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-configure,v 1.7 2021/03/18 08:30:43 jaapb Exp $ 1$NetBSD: patch-configure,v 1.8 2023/01/09 14:24:40 wiz Exp $
2 2
3Do not install META files for libraries that were split off 3Do not install META files for libraries that were split off
4 4
5--- configure.orig 2021-03-16 11:43:00.000000000 +0000 5--- configure.orig 2023-01-09 14:18:01.493625801 +0000
6+++ configure 6+++ configure
7@@ -511,10 +511,10 @@ fi 7@@ -555,10 +555,10 @@ fi
8  8 check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi
9 check_library bigarray 'possible since 4.08' 9 check_library bigarray 'possible since 4.08'
10 check_library compiler-libs '' 'compiler-libs' 10 check_library compiler-libs '' 'compiler-libs'
11-check_library dbm 'normal since 4.00' 11-check_library dbm 'normal since 4.00'
12-check_library graphics 'normal since 4.09' 12-check_library graphics 'normal since 4.09'
13-check_library num 'normal since 4.06' 13-check_library num 'normal since 4.06'
14-check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma 14-check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma
15+#check_library dbm 'normal since 4.00' 15+#check_library dbm 'normal since 4.00'
16+#check_library graphics 'normal since 4.09' 16+#check_library graphics 'normal since 4.09'
17+#check_library num 'normal since 4.06' 17+#check_library num 'normal since 4.06'
18+#check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma 18+#check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma
19 check_library ocamldoc '' ocamldoc/odoc.cmi 19 check_library ocamldoc '' ocamldoc/odoc.cmi
20 check_library raw_spacetime 'normal since 4.12' raw_spacetime_lib.cmxa 20 check_library raw_spacetime 'normal since 4.12' raw_spacetime_lib.cmxa
21 check_library threads '' threads/thread.cmi vmthreads/thread.cmi; 21 check_library threads '' threads/thread.cmi vmthreads/thread.cmi;
File Deleted: pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_bytes_Makefile
File Deleted: pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib-toolbox_Makefile
File Deleted: pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile