From d532c228bd424b998ba81c8a211945a09b8adead Mon Sep 17 00:00:00 2001 From: Johan van Selst Date: Mon, 26 Oct 2015 19:41:22 +0000 Subject: [PATCH] - Update to findlib 1.5.6 - Correct hidden dependency --- devel/ocaml-findlib/Makefile | 5 +++-- devel/ocaml-findlib/distinfo | 4 ++-- devel/ocaml-findlib/files/patch-Makefile | 2 +- devel/ocaml-findlib/files/patch-src__bytes__Makefile | 2 +- .../files/patch-src_findlib-toolbox_Makefile | 2 +- devel/ocaml-findlib/files/patch-src_findlib_Makefile | 6 +++--- devel/ocaml-findlib/pkg-plist | 9 +++++++++ 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 436f571968ef..5b8bfbb27b81 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= findlib -PORTVERSION= 1.5.5 -PORTREVISION= 2 +PORTVERSION= 1.5.6 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -28,6 +27,8 @@ OPTIONS_DEFAULT=TOOLBOX OPTIONS_SUB= yes TOOLBOX_DESC= Include toolbox interface (requires OCaml with TK) TOOLBOX_CONFIGURE_ON= -with-toolbox +TOOLBOX_RUN_DEPENDS= labltk:${PORTSDIR}/x11-toolkits/ocaml-labltk +TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} MAKE_JOBS_UNSAFE= yes diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index 9bc525a3109d..e01728232646 100644 --- a/devel/ocaml-findlib/distinfo +++ b/devel/ocaml-findlib/distinfo @@ -1,2 +1,2 @@ -SHA256 (findlib-1.5.5.tar.gz) = aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 -SIZE (findlib-1.5.5.tar.gz) = 240247 +SHA256 (findlib-1.5.6.tar.gz) = 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 +SIZE (findlib-1.5.6.tar.gz) = 250865 diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile index 11eccc10965a..372f86b36838 100644 --- a/devel/ocaml-findlib/files/patch-Makefile +++ b/devel/ocaml-findlib/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-10-23 10:08:26 UTC +--- Makefile.orig 2015-10-25 12:46:54 UTC +++ Makefile @@ -17,14 +17,14 @@ opt: for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done diff --git a/devel/ocaml-findlib/files/patch-src__bytes__Makefile b/devel/ocaml-findlib/files/patch-src__bytes__Makefile index 6e295178ad18..ad86e0dc790f 100644 --- a/devel/ocaml-findlib/files/patch-src__bytes__Makefile +++ b/devel/ocaml-findlib/files/patch-src__bytes__Makefile @@ -1,4 +1,4 @@ ---- src/bytes/Makefile.orig 2014-10-23 10:08:26 UTC +--- src/bytes/Makefile.orig 2015-10-25 12:46:55 UTC +++ src/bytes/Makefile @@ -19,9 +19,9 @@ opt: $(OCAMLBUILD) $$files diff --git a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile index 51223589b8d5..a366403e89c8 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile @@ -1,4 +1,4 @@ ---- src/findlib-toolbox/Makefile.orig 2014-10-23 10:08:26 UTC +--- src/findlib-toolbox/Makefile.orig 2015-10-25 12:46:55 UTC +++ src/findlib-toolbox/Makefile @@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m findlib.cma make_wizard.ml diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile index 590748919679..83de373bbb6c 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile @@ -1,4 +1,4 @@ ---- src/findlib/Makefile.orig 2014-10-23 10:08:26 UTC +--- src/findlib/Makefile.orig 2015-10-25 12:46:54 UTC +++ src/findlib/Makefile @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep OCAMLLEX = ocamllex @@ -8,7 +8,7 @@ OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ -@@ -97,23 +98,23 @@ clean: +@@ -112,23 +113,23 @@ clean: ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) install: all @@ -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 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.cmxa findlib.a findlib.cmxs META` && \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma 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.cmxa findlib.a findlib.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)" + ${BSD_INSTALL_DATA} $$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 3e1bdc5b3b20..8c0a872f1ef8 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -14,15 +14,24 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/findlib/findlib.cmxa %%OCAML_SITELIBDIR%%/findlib/findlib.cmxs %%OCAML_SITELIBDIR%%/findlib/findlib.mli +%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.a +%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma +%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa +%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxs %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma +%%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi +%%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.mli %%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi %%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi %%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli +%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard +%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern %%OCAML_SITELIBDIR%%/findlib/topfind.cmi %%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