diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index e9d8817fd437..89149dcb09d3 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,68 +1,67 @@ # Created by: ijliao PORTNAME= findlib -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- MAINTAINER= hrs@FreeBSD.org COMMENT= OCaml package manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake USE_OCAML= yes USE_OCAML_CAMLP4=yes USE_OCAML_FINDLIB=yes OCAMLFIND_DEPEND= # Avoid dependency loop HAS_CONFIGURE= yes CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \ -sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \ -config "${PREFIX}/etc/findlib.conf" MAKE_ENV= OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" ALL_TARGET= all opt 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_DESC= Include toolbox interface (requires OCaml with Tk) TOOLBOX_CONFIGURE_ON= -with-toolbox TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} .include post-install: cd ${STAGEDIR}${PREFIX} && \ ${STRIP_CMD} bin/ocamlfind \ ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs +.if !exists(${LOCALBASE}/lib/ocaml/graphics.cmi) + @${REINPLACE_CMD} -e '/graphics\/META/d' ${TMPPLIST} +.endif +.if !exists(${LOCALBASE}/lib/ocaml/ocamlbuild/ocamlbuildlib.cma) + @${REINPLACE_CMD} -e '/ocamlbuild\/META/d' ${TMPPLIST} +.endif # Spacetime profiling is only available for native code on 64-bit targets .if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpcspe @${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST} .endif post-install-TOOLBOX-on: ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ "! -regex .*ref-man.*" .include diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index 967f18478c77..f83e1fbb2219 100644 --- a/devel/ocaml-findlib/distinfo +++ b/devel/ocaml-findlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496673173 -SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b -SIZE (findlib-1.7.3.tar.gz) = 257703 +TIMESTAMP = 1564402014 +SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 +SIZE (findlib-1.8.1.tar.gz) = 261544 diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure deleted file mode 100644 index 4b41a7aba575..000000000000 --- a/devel/ocaml-findlib/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 ed355991105d..b370954773a3 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile @@ -1,42 +1,42 @@ --- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC +++ src/findlib/Makefile @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep OCAMLLEX = ocamllex #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo -- +OCAML_LIBBIN=${PREFIX}/lib/ocaml OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ @@ -119,23 +120,23 @@ clean: ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) install: all - mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" - mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + 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=`$(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` && \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) 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$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) 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)"; }; \ - cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" + cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" # the following "if" block is only needed for 4.00beta2 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ - cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ + cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ fi install-num-top: - mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top" + mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" cp num_top.cma num_top.cmi num_top_printers.cmi \ - "$(prefix)$(OCAML_SITELIB)/num-top" + "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" # Note: uninstall-num-top is part of the removal of the META files. diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index f9614c2d3703..fe8db7125078 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -1,53 +1,49 @@ bin/ocamlfind bin/safe_camlp4 %%ETCDIR%%.conf %%OCAML_SITELIBDIR%%/bigarray/META %%OCAML_SITELIBDIR%%/bytes/META %%OCAML_SITELIBDIR%%/camlp4/META %%OCAML_SITELIBDIR%%/compiler-libs/META %%OCAML_SITELIBDIR%%/dynlink/META %%OCAML_SITELIBDIR%%/findlib/META %%OCAML_SITELIBDIR%%/findlib/Makefile.config %%OCAML_SITELIBDIR%%/findlib/findlib.a %%OCAML_SITELIBDIR%%/findlib/findlib.cma %%OCAML_SITELIBDIR%%/findlib/findlib.cmi %%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.a %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs %%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 -%%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%%/ocamlbuild/META %%OCAML_SITELIBDIR%%/ocamldoc/META %%OCAML_SITELIBDIR%%/raw_spacetime/META %%OCAML_SITELIBDIR%%/stdlib/META %%OCAML_SITELIBDIR%%/str/META %%OCAML_SITELIBDIR%%/threads/META %%OCAML_SITELIBDIR%%/unix/META lib/ocaml/topfind man/man1/ocamlfind.1.gz man/man5/META.5.gz man/man5/findlib.conf.5.gz man/man5/site-lib.5.gz