pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Updated devel/ocaml-findlib to ver...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7e18e785f95e
branches: trunk
changeset: 448923:7e18e785f95e
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Thu Mar 18 08:30:43 2021 +0000
description:
Updated devel/ocaml-findlib to version 1.9.1.
Changes are mostly incremental (compatibility issues, bugfixes).
diffstat:
devel/ocaml-findlib/Makefile | 5 +-
devel/ocaml-findlib/PLIST | 3 +-
devel/ocaml-findlib/buildlink3.mk | 4 +-
devel/ocaml-findlib/distinfo | 18 +-
devel/ocaml-findlib/patches/patch-Makefile | 34 +-
devel/ocaml-findlib/patches/patch-configure | 92 +--------
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 | 3 +-
9 files changed, 87 insertions(+), 106 deletions(-)
diffs (292 lines):
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/Makefile Thu Mar 18 08:30:43 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2021/03/08 08:12:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.49 2021/03/18 08:30:43 jaapb Exp $
-DISTNAME= findlib-1.8.1
+DISTNAME= findlib-1.9.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/PLIST
--- a/devel/ocaml-findlib/PLIST Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/PLIST Thu Mar 18 08:30:43 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2019/05/14 15:55:44 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.21 2021/03/18 08:30:43 jaapb Exp $
bin/ocamlfind
${OCAML_SITELIB}/bigarray/META
${OCAML_SITELIB}/bytes/META
@@ -6,6 +6,7 @@
${OCAML_SITELIB}/dynlink/META
${OCAML_SITELIB}/findlib/META
${OCAML_SITELIB}/findlib/Makefile.config
+${OCAML_SITELIB}/findlib/Makefile.packages
${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
${OCAML_SITELIB}/findlib/findlib.cma
${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/buildlink3.mk
--- a/devel/ocaml-findlib/buildlink3.mk Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/buildlink3.mk Thu Mar 18 08:30:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2019/07/31 09:09:28 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2021/03/18 08:30:43 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.8.1
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.9.1
BUILDLINK_PKGSRCDIR.ocaml-findlib?= ../../devel/ocaml-findlib
BUILDLINK_TARGETS+= ocaml-findlib-wrappers ocaml-findlib-ldconf
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/distinfo Thu Mar 18 08:30:43 2021 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.20 2019/07/31 09:07:00 jaapb Exp $
+$NetBSD: distinfo,v 1.21 2021/03/18 08:30:43 jaapb Exp $
-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) = 5322bcda8cdab7fe2e54f1a1219b416fefb8b14a
+SHA1 (findlib-1.9.1.tar.gz) = c3df26be239d828156014e9bad43018dcab1fafd
+RMD160 (findlib-1.9.1.tar.gz) = 41a0580f0b506112d7e553390b74f7e3015f4d4a
+SHA512 (findlib-1.9.1.tar.gz) = 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84
+Size (findlib-1.9.1.tar.gz) = 273012 bytes
+SHA1 (patch-Makefile) = 449237f90ee19862109f52d2f2be1d10fafc0e2c
+SHA1 (patch-configure) = b5730cab9598dda0a1f12ea77474612fe580e4ab
+SHA1 (patch-src_bytes_Makefile) = cd44d56a6cb48b3a14e14b237fd0b744921c092a
+SHA1 (patch-src_findlib-toolbox_Makefile) = 621e478386516c751968f517f8824c9f4d6d62a1
+SHA1 (patch-src_findlib_Makefile) = f8cb5b6d67df50017efb89eec94883144011202d
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/patches/patch-Makefile
--- a/devel/ocaml-findlib/patches/patch-Makefile Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/patches/patch-Makefile Thu Mar 18 08:30:43 2021 +0000
@@ -1,27 +1,27 @@
-$NetBSD: patch-Makefile,v 1.6 2017/07/11 09:57:11 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.7 2021/03/18 08:30:43 jaapb Exp $
make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
---- Makefile.orig 2017-06-05 14:32:28.000000000 +0000
+
+--- Makefile.orig 2021-03-16 11:43:00.000000000 +0000
+++ Makefile
-@@ -17,14 +17,14 @@ opt:
+@@ -18,13 +18,13 @@ opt:
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
- install:
+ install: check-installation
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
-+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
-+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
++ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
++ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
$(MAKE) install-config
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
$(MAKE) install-meta
- 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)"; \
- fi
+ 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 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
$(MAKE) install-doc
-@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
+ uninstall: check-installation
+@@ -70,9 +70,9 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
@@ -34,16 +34,18 @@
.PHONY: uninstall-doc
uninstall-doc:
-@@ -86,7 +86,7 @@ uninstall-doc:
+@@ -102,8 +102,8 @@ check-installation:
.PHONY: install-meta
install-meta:
-- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
-+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META
"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+- for x in $(SITELIB_META); do mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; 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 "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; done
++ $(BSD_INSTALL_LIB_DIR) -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib"; $(BSD_INSTALL_DATA) Makefile.packages "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib/Makefile.packages"
.PHONY: uninstall-meta
uninstall-meta:
-@@ -94,9 +94,9 @@ uninstall-meta:
+@@ -111,9 +111,9 @@ uninstall-meta:
.PHONY: install-config
install-config:
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure Thu Mar 18 08:30:43 2021 +0000
@@ -1,79 +1,21 @@
-$NetBSD: patch-configure,v 1.6 2019/05/14 15:55:44 jaapb Exp $
+$NetBSD: patch-configure,v 1.7 2021/03/18 08:30:43 jaapb Exp $
Do not install META files for libraries that were split off
---- configure.orig 2018-04-16 08:13:23.000000000 +0000
+
+--- configure.orig 2021-03-16 11:43:00.000000000 +0000
+++ configure
-@@ -518,32 +518,32 @@ fi
-
- # dbm?
-
--if [ -f "${ocaml_sitelib}/dbm/META" ]; then
-- echo "dbm: package already present"
-- ldbm=""
--elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
-- echo "dbm: found"
-- ldbm="dbm"
--else
-- echo "dbm: not present (normal since OCaml-4.00)"
-- ldbm=""
--fi
-+#if [ -f "${ocaml_sitelib}/dbm/META" ]; then
-+# echo "dbm: package already present"
-+# ldbm=""
-+#lif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
-+# echo "dbm: found"
-+# ldbm="dbm"
-+#lse
-+# echo "dbm: not present (normal since OCaml-4.00)"
-+ ldbm=""
-+#i
-
- # num?
+@@ -511,10 +511,10 @@ fi
--if [ -f "${ocaml_sitelib}/num/META" ]; then
-- echo "num: package already present"
-- lnum=""
-- numtop=""
--elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
-- echo "num: found but not as package"
-- lnum="num num-top"
-- numtop="num-top"
--else
-- echo "num: not present (normal since OCaml-4.06)"
-+#if [ -f "${ocaml_sitelib}/num/META" ]; then
-+# echo "num: package already present"
-+# lnum=""
-+# numtop=""
-+#elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
-+# echo "num: found but not as package"
-+# lnum="num num-top"
-+# numtop="num-top"
-+#else
-+# echo "num: not present (normal since OCaml-4.06)"
- lnum=""
- numtop=""
--fi
-+#fi
-
- # bytes?
-
-@@ -570,13 +570,13 @@ fi
-
- # graphics?
-
--if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
-- echo "graphics: found"
-- lgraphics="graphics"
--else
-- echo "graphics: not found"
-+#if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
-+# echo "graphics: found"
-+# lgraphics="graphics"
-+#else
-+# echo "graphics: not found"
- lgraphics=""
--fi
-+#fi
-
-
- # Generate the META files now.
+ check_library bigarray 'possible since 4.08'
+ check_library compiler-libs '' 'compiler-libs'
+-check_library dbm 'normal since 4.00'
+-check_library graphics 'normal since 4.09'
+-check_library num 'normal since 4.06'
+-check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma
++#check_library dbm 'normal since 4.00'
++#check_library graphics 'normal since 4.09'
++#check_library num 'normal since 4.06'
++#check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma
+ check_library ocamldoc '' ocamldoc/odoc.cmi
+ check_library raw_spacetime 'normal since 4.12' raw_spacetime_lib.cmxa
+ check_library threads '' threads/thread.cmi vmthreads/thread.cmi;
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/patches/patch-src_bytes_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-findlib/patches/patch-src_bytes_Makefile Thu Mar 18 08:30:43 2021 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_bytes_Makefile,v 1.1 2021/03/18 08:30:43 jaapb Exp $
+
+Install into DESTDIR, use BSD install commands
+
+--- src/bytes/Makefile.orig 2021-03-16 11:43:01.000000000 +0000
++++ src/bytes/Makefile
+@@ -19,9 +19,9 @@ opt:
+ $(OCAMLBUILD) $$files
+
+ install: all
+- mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes"
+- cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
+- cd _build/ && 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 "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"
++ cd _build/ && $(BSD_INSTALL_DATA) ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
++ cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then $(BSD_INSTALL_LIB) $$f "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
+
+ uninstall:
+ rm -rf "$(prefix)$(OCAML_SITELIB)/bytes"
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-findlib/patches/patch-src_findlib-toolbox_Makefile Thu Mar 18 08:30:43 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_findlib-toolbox_Makefile,v 1.1 2021/03/18 08:30:43 jaapb Exp $
+
+Install into DESTDIR, use BSD install commands
+
+--- src/findlib-toolbox/Makefile.orig 2021-03-16 11:43:01.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 $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
+
+ # uninstall: Nothing to do, because the removal of the findlib core also
+ # deinstalls the make_wizard
diff -r 081832108b9c -r 7e18e785f95e devel/ocaml-findlib/patches/patch-src_findlib_Makefile
--- a/devel/ocaml-findlib/patches/patch-src_findlib_Makefile Thu Mar 18 07:33:48 2021 +0000
+++ b/devel/ocaml-findlib/patches/patch-src_findlib_Makefile Thu Mar 18 08:30:43 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.9 2019/07/31 09:07:00 jaapb Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.10 2021/03/18 08:30:43 jaapb Exp $
Install into DESTDIR, use BSD install commands
+
--- src/findlib/Makefile.orig 2019-07-29 12:06:35.000000000 +0000
+++ src/findlib/Makefile
@@ -118,23 +118,23 @@ clean:
Home |
Main Index |
Thread Index |
Old Index