From owner-dev-commits-ports-all@freebsd.org Mon Sep 6 09:53:20 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5FE53672010;
Mon, 6 Sep 2021 09:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4H33cc09lbz4l22;
Mon, 6 Sep 2021 09:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D9EDB1CD36;
Mon, 6 Sep 2021 09:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1869rJ6V084935;
Mon, 6 Sep 2021 09:53:19 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1869rJSY084934;
Mon, 6 Sep 2021 09:53:19 GMT (envelope-from git)
Date: Mon, 6 Sep 2021 09:53:19 GMT
Message-Id: <202109060953.1869rJSY084934@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Subject: git: 71f8685b4274 - main - devel/ocaml-findlib: transient (minor)
update to version 1.7.3
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: danfe
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 71f8685b4274ec17836e980d86f6447ca34bbba9
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
<dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>,
<mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>,
<mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Sep 2021 09:53:20 -0000
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=71f8685b4274ec17836e980d86f6447ca34bbba9
commit 71f8685b4274ec17836e980d86f6447ca34bbba9
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-09-06 09:52:16 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-09-06 09:52:16 +0000
devel/ocaml-findlib: transient (minor) update to version 1.7.3
There should be no user-visible changes, but it makes easier to
handle Num library which was split off the core OCaml starting
with 4.06.0 release.
---
devel/ocaml-findlib/Makefile | 10 +++++++++-
devel/ocaml-findlib/distinfo | 6 +++---
devel/ocaml-findlib/files/patch-Makefile | 10 +++++-----
devel/ocaml-findlib/files/patch-configure | 12 ++++++++++++
devel/ocaml-findlib/files/patch-src_findlib_Makefile | 2 +-
devel/ocaml-findlib/pkg-plist | 10 +++++-----
6 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 047ea5c78bd5..e9d8817fd437 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,7 +1,7 @@
# Created by: ijliao
PORTNAME= findlib
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.3
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-
@@ -27,9 +27,17 @@ MAKE_JOBS_UNSAFE= yes
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
PORTDOCS= *
+# Num library is not part of OCaml core since v4.06
+.if exists(${LOCALBASE}/lib/ocaml/num.cmi)
+PLIST_SUB+= NUM=""
+.else
+PLIST_SUB+= NUM="@comment "
+.endif
+
OPTIONS_DEFINE= TOOLBOX DOCS
OPTIONS_DEFAULT=TOOLBOX
OPTIONS_SUB= yes
+
TOOLBOX_DESC= Include toolbox interface (requires OCaml with TK)
TOOLBOX_CONFIGURE_ON= -with-toolbox
TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index bf3555519a1e..967f18478c77 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484407844
-SHA256 (findlib-1.7.1.tar.gz) = 5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef
-SIZE (findlib-1.7.1.tar.gz) = 256883
+TIMESTAMP = 1496673173
+SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
+SIZE (findlib-1.7.3.tar.gz) = 257703
diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile
index 95459974581b..55fa741e5c06 100644
--- a/devel/ocaml-findlib/files/patch-Makefile
+++ b/devel/ocaml-findlib/files/patch-Makefile
@@ -11,10 +11,10 @@
$(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)"; \
++ ${BSD_INSTALL_SCRIPT} tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
fi
$(MAKE) install-doc
@@ -22,8 +22,8 @@
USE_CYGPATH="$(USE_CYGPATH)"; \
export USE_CYGPATH; \
cat findlib.conf.in | \
-- tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
-+ tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf
+- $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
++ $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf
if ./tools/cmd_from_same_dir ocamlc; then \
echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
fi
@@ -58,7 +58,7 @@
- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
-+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || ${BSD_INSTALL_DATA} findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
++ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || ${BSD_INSTALL_DATA} findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
.PHONY: uninstall-config
uninstall-config:
diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure
new file mode 100644
index 000000000000..4b41a7aba575
--- /dev/null
+++ b/devel/ocaml-findlib/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig 2016-11-18 13:04:45 UTC
++++ configure
+@@ -516,7 +516,8 @@ fi
+
+ # bytes?
+
+-if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then
++if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \
++ -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then
+ echo "bytes: found, installing fake library"
+ lbytes="bytes"
+ cbytes=0
diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
index 1f91a4d5ba77..ed355991105d 100644
--- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile
+++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
@@ -18,7 +18,7 @@
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp 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)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist
index 8d0cad0e5353..f9614c2d3703 100644
--- a/devel/ocaml-findlib/pkg-plist
+++ b/devel/ocaml-findlib/pkg-plist
@@ -35,11 +35,11 @@ bin/safe_camlp4
%%OCAML_SITELIBDIR%%/findlib/topfind.mli
%%OCAML_SITELIBDIR%%/graphics/META
%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
-%%OCAML_SITELIBDIR%%/num-top/META
-%%OCAML_SITELIBDIR%%/num-top/num_top.cma
-%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
-%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
-%%OCAML_SITELIBDIR%%/num/META
+%%NUM%%%%OCAML_SITELIBDIR%%/num-top/META
+%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cma
+%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
+%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
+%%NUM%%%%OCAML_SITELIBDIR%%/num/META
%%OCAML_SITELIBDIR%%/ocamldoc/META
%%OCAML_SITELIBDIR%%/raw_spacetime/META
%%OCAML_SITELIBDIR%%/stdlib/META