diff --git a/devel/Makefile b/devel/Makefile index 4dd807f26..b0c6a1557 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1619,6 +1619,7 @@ SUBDIR += ocaml-sdl SUBDIR += ocaml-sem SUBDIR += ocaml-sexplib + SUBDIR += ocaml-sexplib0 SUBDIR += ocaml-type_conv SUBDIR += ocaml-ulex SUBDIR += ocaml-uutf diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile index 602d13c51..da7d1f2ea 100644 --- a/devel/ocaml-camlp4/Makefile +++ b/devel/ocaml-camlp4/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Grünewald PORTNAME= camlp4 -PORTVERSION= 4.05+2 +PORTVERSION= 4.12+1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo index 058ba6be8..c3db072b9 100644 --- a/devel/ocaml-camlp4/distinfo +++ b/devel/ocaml-camlp4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533176554 -SHA256 (ocaml-camlp4-4.05+2_GH0.tar.gz) = db242c0f4896ddd9dc7d6e8064cba8bf099fb9a4d4f5ed35120978501cd3a935 -SIZE (ocaml-camlp4-4.05+2_GH0.tar.gz) = 647609 +TIMESTAMP = 1630217454 +SHA256 (ocaml-camlp4-4.12+1_GH0.tar.gz) = 84a53195d916f208b8fd761cbd34cec7882863b94d9df2ce43198d727739cda3 +SIZE (ocaml-camlp4-4.12+1_GH0.tar.gz) = 650487 diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index 101a5bb68..7b292c9ad 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -1,7 +1,8 @@ # Created by: Hirohisa Yamaguchi PORTNAME= camlp5 -PORTVERSION= 7.07 +DISTVERSIONPREFIX= rel +DISTVERSION= 8.00.02 CATEGORIES= devel PKGNAMEPREFIX= ocaml- DIST_SUBDIR= ${PKGBASE} @@ -14,9 +15,8 @@ LICENSE_NAME= INRIA permissive license with copyright notice requirements LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= tar:tgz +USES= gmake perl5 tar:tgz USE_GITHUB= yes -GH_TAGNAME= rel${PORTVERSION:S/.//} USE_OCAML= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} @@ -32,7 +32,7 @@ STRICT_DESC= New syntax tree quotations kit OPTIONS_DEFINE= DOCS DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} -PORTDOCS= CHANGES DEVEL ICHANGES INSTALL MODE README UPGRADING +PORTDOCS= CHANGES DEVEL ICHANGES MODE UPGRADING STRICT_CONFIGURE_ON= --strict TRANSITIONAL_CONFIGURE_ON= --transitional diff --git a/devel/ocaml-camlp5/distinfo b/devel/ocaml-camlp5/distinfo index 2ff8c4ba9..fc5d81e69 100644 --- a/devel/ocaml-camlp5/distinfo +++ b/devel/ocaml-camlp5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539160056 -SHA256 (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = a2c493b833b217adf94d2000eb19015b990c4e441beb35cf36b1d33ed2351991 -SIZE (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = 813500 +TIMESTAMP = 1630216813 +SHA256 (ocaml-camlp5/camlp5-camlp5-rel8.00.02_GH0.tar.gz) = 3c8c5c574b739cd9e4f0fd4881625ec4c67b456b64fc04ed2882e89a724577fd +SIZE (ocaml-camlp5/camlp5-camlp5-rel8.00.02_GH0.tar.gz) = 1340114 diff --git a/devel/ocaml-camlp5/pkg-plist b/devel/ocaml-camlp5/pkg-plist index 60b8267cd..be6f20fd0 100644 --- a/devel/ocaml-camlp5/pkg-plist +++ b/devel/ocaml-camlp5/pkg-plist @@ -9,11 +9,16 @@ bin/mkcamlp5.opt bin/ocpp5 lib/ocaml/camlp5/META lib/ocaml/camlp5/ast2pt.cmi +lib/ocaml/camlp5/ast2pt.cmx lib/ocaml/camlp5/ast2pt.mli +lib/ocaml/camlp5/asttools.cmi +lib/ocaml/camlp5/asttools.cmx lib/ocaml/camlp5/camlp5.a lib/ocaml/camlp5/camlp5.cma lib/ocaml/camlp5/camlp5.cmxa lib/ocaml/camlp5/camlp5_top.cma +lib/ocaml/camlp5/camlp5_top_funs.cmi +lib/ocaml/camlp5/camlp5_top_funs.cmo lib/ocaml/camlp5/camlp5o.cma lib/ocaml/camlp5/camlp5r.cma lib/ocaml/camlp5/camlp5sch.cma @@ -44,6 +49,8 @@ lib/ocaml/camlp5/grammar.mli lib/ocaml/camlp5/lib.sml lib/ocaml/camlp5/mLast.cmi lib/ocaml/camlp5/mLast.mli +lib/ocaml/camlp5/mlsyntax.cmi +lib/ocaml/camlp5/mlsyntax.cmx lib/ocaml/camlp5/ocpp.cmo lib/ocaml/camlp5/odyl.a lib/ocaml/camlp5/odyl.cma @@ -83,6 +90,13 @@ lib/ocaml/camlp5/pa_macro.cmi lib/ocaml/camlp5/pa_macro.cmo lib/ocaml/camlp5/pa_macro.cmx lib/ocaml/camlp5/pa_macro.o +lib/ocaml/camlp5/pa_macro_gram.cmi +lib/ocaml/camlp5/pa_macro_gram.cmo +lib/ocaml/camlp5/pa_macro_gram.cmx +lib/ocaml/camlp5/pa_macro_gram.o +lib/ocaml/camlp5/pa_macro_print.cmo +lib/ocaml/camlp5/pa_macro_print.cmx +lib/ocaml/camlp5/pa_macro_print.o lib/ocaml/camlp5/pa_mkast.cmo lib/ocaml/camlp5/pa_mkast.cmx lib/ocaml/camlp5/pa_mkast.o @@ -118,10 +132,17 @@ lib/ocaml/camlp5/pa_rp.o lib/ocaml/camlp5/pa_scheme.cmo lib/ocaml/camlp5/pa_scheme.cmx lib/ocaml/camlp5/pa_scheme.o +lib/ocaml/camlp5/pa_schemer.cmo +lib/ocaml/camlp5/pa_schemer.cmx +lib/ocaml/camlp5/pa_schemer.o lib/ocaml/camlp5/pa_sml.cmo lib/ocaml/camlp5/pa_sml.cmx lib/ocaml/camlp5/pa_sml.o +lib/ocaml/camlp5/papr_phony_macro.cmo +lib/ocaml/camlp5/papr_phony_macro.cmx +lib/ocaml/camlp5/papr_phony_macro.o lib/ocaml/camlp5/pcaml.cmi +lib/ocaml/camlp5/pcaml.cmx lib/ocaml/camlp5/pcaml.mli lib/ocaml/camlp5/plexer.cmi lib/ocaml/camlp5/plexer.cmx @@ -132,6 +153,8 @@ lib/ocaml/camlp5/plexing.mli lib/ocaml/camlp5/ploc.cmi lib/ocaml/camlp5/ploc.cmx lib/ocaml/camlp5/ploc.mli +lib/ocaml/camlp5/pp_debug.cmi +lib/ocaml/camlp5/pp_debug.cmx lib/ocaml/camlp5/pprintf.cmi lib/ocaml/camlp5/pprintf.cmx lib/ocaml/camlp5/pprintf.mli @@ -153,12 +176,17 @@ lib/ocaml/camlp5/pr_extprint.o lib/ocaml/camlp5/pr_null.cmo lib/ocaml/camlp5/pr_null.cmx lib/ocaml/camlp5/pr_null.o +lib/ocaml/camlp5/pr_o.cmi lib/ocaml/camlp5/pr_o.cmo lib/ocaml/camlp5/pr_o.cmx lib/ocaml/camlp5/pr_o.o +lib/ocaml/camlp5/pr_official.cmo +lib/ocaml/camlp5/pr_official.cmx +lib/ocaml/camlp5/pr_official.o lib/ocaml/camlp5/pr_op.cmo lib/ocaml/camlp5/pr_op.cmx lib/ocaml/camlp5/pr_op.o +lib/ocaml/camlp5/pr_r.cmi lib/ocaml/camlp5/pr_r.cmo lib/ocaml/camlp5/pr_r.cmx lib/ocaml/camlp5/pr_r.o @@ -178,19 +206,28 @@ lib/ocaml/camlp5/pretty.cmi lib/ocaml/camlp5/pretty.cmx lib/ocaml/camlp5/pretty.mli lib/ocaml/camlp5/prtools.cmi +lib/ocaml/camlp5/prtools.cmx lib/ocaml/camlp5/prtools.mli +lib/ocaml/camlp5/q_MLast.cmi lib/ocaml/camlp5/q_MLast.cmo lib/ocaml/camlp5/q_MLast.cmx lib/ocaml/camlp5/q_MLast.o +lib/ocaml/camlp5/q_ast.cmi lib/ocaml/camlp5/q_ast.cmo lib/ocaml/camlp5/q_ast.cmx lib/ocaml/camlp5/q_ast.o +lib/ocaml/camlp5/q_ast_base.cmi +lib/ocaml/camlp5/q_ast_base.cmo +lib/ocaml/camlp5/q_ast_base.cmx +lib/ocaml/camlp5/q_ast_base.o lib/ocaml/camlp5/q_phony.cmo lib/ocaml/camlp5/q_phony.cmx lib/ocaml/camlp5/q_phony.o lib/ocaml/camlp5/quotation.cmi +lib/ocaml/camlp5/quotation.cmx lib/ocaml/camlp5/quotation.mli lib/ocaml/camlp5/reloc.cmi +lib/ocaml/camlp5/reloc.cmx lib/ocaml/camlp5/reloc.mli lib/ocaml/camlp5/stdpp.cmi lib/ocaml/camlp5/stdpp.cmx diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile index 8bfccf4bd..5f7877e68 100644 --- a/devel/ocaml-cppo/Makefile +++ b/devel/ocaml-cppo/Makefile @@ -1,16 +1,32 @@ # Created by: Michael Grunewald PORTNAME= cppo -PORTVERSION= 0.9.2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.6.7 CATEGORIES= devel -MASTER_SITES= http://martin.jambon.free.fr/ +#MASTER_SITES= http://martin.jambon.free.fr/ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Simple preprocessor for OCaml +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +BUILD_DEPENDS= dune:devel/ocaml-dune \ + ocamlbuild:devel/ocaml-ocamlbuild + USES= gmake USE_OCAML= yes -MAKE_JOBS_UNSAFE= yes + +USE_GITHUB= yes +GH_ACCOUNT= ocaml-community + +MAKE_ARGS= INSTALL_ARGS="--libdir=${OCAML_SITELIBDIR}" + +post-install: + ${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild/cppo_ocamlbuild.cmxs .include diff --git a/devel/ocaml-cppo/distinfo b/devel/ocaml-cppo/distinfo index 29197d4ea..4a8896b38 100644 --- a/devel/ocaml-cppo/distinfo +++ b/devel/ocaml-cppo/distinfo @@ -1,2 +1,3 @@ -SHA256 (cppo-0.9.2.tar.gz) = ee4693b16e82e0d7f9b955dc6d935c518958fdd87b8e9402cc54a52e6e03897f -SIZE (cppo-0.9.2.tar.gz) = 20234 +TIMESTAMP = 1630266326 +SHA256 (ocaml-community-cppo-v1.6.7_GH0.tar.gz) = 05da2db9b9c923105c26ef303ff9802e819146d0130421ba5656b1a8739ec461 +SIZE (ocaml-community-cppo-v1.6.7_GH0.tar.gz) = 29032 diff --git a/devel/ocaml-cppo/pkg-plist b/devel/ocaml-cppo/pkg-plist index 854b89ab4..8651d8874 100644 --- a/devel/ocaml-cppo/pkg-plist +++ b/devel/ocaml-cppo/pkg-plist @@ -1 +1,21 @@ bin/cppo +doc/cppo/LICENSE.md +doc/cppo/README.md +doc/cppo_ocamlbuild/LICENSE.md +doc/cppo_ocamlbuild/README.md +%%OCAML_SITELIBDIR%%/cppo/META +%%OCAML_SITELIBDIR%%/cppo/dune-package +%%OCAML_SITELIBDIR%%/cppo/opam +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/META +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/cppo_ocamlbuild.a +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/cppo_ocamlbuild.cma +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/cppo_ocamlbuild.cmxa +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/cppo_ocamlbuild.cmxs +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/dune-package +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.cmi +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.cmt +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.cmti +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.cmx +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.ml +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/ocamlbuild_cppo.mli +%%OCAML_SITELIBDIR%%/cppo_ocamlbuild/opam diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index 253c19500..65efd8e97 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -17,6 +17,7 @@ simplified_PLIST= ${MASTERDIR}/pkg-plist-simplified .if ${FLAVOR} == default BUILD_DEPENDS= ocaml-csexp>0:textproc/ocaml-csexp # textproc/ocaml-csexp depends on devel/dune@simplified +RUN_DEPENDS= ocaml-csexp>0:textproc/ocaml-csexp .endif USES= gmake diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile index 799210263..9749f4801 100644 --- a/devel/ocaml-extlib/Makefile +++ b/devel/ocaml-extlib/Makefile @@ -1,7 +1,7 @@ # Created by: mukai PORTNAME= extlib -PORTVERSION= 1.7.5 +PORTVERSION= 1.7.8 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -15,8 +15,6 @@ BROKEN_mips= Depends on Ocaml(not available for mips) BUILD_DEPENDS= cppo:devel/ocaml-cppo -WRKSRC_SUBDIR= src - USES= gmake USE_GITHUB= yes GH_ACCOUNT= ygrek @@ -27,6 +25,8 @@ USE_OCAML_CAMLP4=yes USE_OCAML_FINDLIB=yes USE_OCAMLFIND_PLIST=yes +WRKSRC_SUBDIR= src + MAKE_ARGS= VERSION="${PORTVERSION}" ALL_TARGET= all opt doc diff --git a/devel/ocaml-extlib/distinfo b/devel/ocaml-extlib/distinfo index 37877ed50..b8c8ca96f 100644 --- a/devel/ocaml-extlib/distinfo +++ b/devel/ocaml-extlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534731133 -SHA256 (ygrek-ocaml-extlib-1.7.5_GH0.tar.gz) = 28e36367a65b1a5886d09f6d535e73b4aa88076778594c62df653a2b1536e62d -SIZE (ygrek-ocaml-extlib-1.7.5_GH0.tar.gz) = 87781 +TIMESTAMP = 1630267049 +SHA256 (ygrek-ocaml-extlib-1.7.8_GH0.tar.gz) = 9e18c4f807afcef5e5d2050c7b4e375ebe7ee989820eff45d79f29f7195d26d8 +SIZE (ygrek-ocaml-extlib-1.7.8_GH0.tar.gz) = 90213 diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 047ea5c78..5c1c2629c 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.8.1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -12,6 +12,8 @@ COMMENT= OCaml package manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= gmake USE_OCAML= yes USE_OCAML_CAMLP4=yes @@ -43,10 +45,6 @@ post-install: ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs -# 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 \ diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index bf3555519..e1d4c3677 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 = 1607113401 +SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 +SIZE (findlib-1.8.1.tar.gz) = 261544 diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile index 954599745..639d27a2d 100644 --- a/devel/ocaml-findlib/files/patch-Makefile +++ b/devel/ocaml-findlib/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2016-11-18 13:04:45 UTC +--- Makefile.orig 2019-07-29 12:06:34 UTC +++ Makefile -@@ -17,14 +17,14 @@ opt: +@@ -17,14 +17,14 @@ for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done install: @@ -11,23 +11,23 @@ $(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)"; \ fi $(MAKE) install-doc -@@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in +@@ -55,7 +55,7 @@ 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 -@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in +@@ -71,9 +71,9 @@ .PHONY: install-doc install-doc: @@ -40,7 +40,7 @@ .PHONY: uninstall-doc uninstall-doc: -@@ -86,7 +86,7 @@ uninstall-doc: +@@ -86,7 +86,7 @@ .PHONY: install-meta install-meta: @@ -49,7 +49,7 @@ .PHONY: uninstall-meta uninstall-meta: -@@ -94,9 +94,9 @@ uninstall-meta: +@@ -94,9 +94,9 @@ .PHONY: install-config install-config: diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile index 1f91a4d5b..4b85e6ca3 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile @@ -1,6 +1,6 @@ ---- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC +--- src/findlib/Makefile.orig 2019-07-29 12:06:35 UTC +++ src/findlib/Makefile -@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep +@@ -19,6 +19,7 @@ OCAMLLEX = ocamllex #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo -- @@ -8,7 +8,7 @@ OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ -@@ -119,23 +120,23 @@ clean: +@@ -118,23 +119,23 @@ 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 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)"; }; \ diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index 8d0cad0e5..9fb06d553 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -33,15 +33,9 @@ bin/safe_camlp4 %%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 -%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi -%%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 diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 1ffff1aca..287f33dc9 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,7 +1,7 @@ # Created by: jaapb@kerguelen.org PORTNAME= lwt -PORTVERSION= 2.5.2 +PORTVERSION= 5.4.2 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -10,17 +10,13 @@ COMMENT= Cooperative threading library for OCaml LICENSE= LGPL21 -BUILD_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ +BUILD_DEPENDS= ocaml-dune>0:devel/ocaml-dune \ + ${SA_DIR}/react/react.a:devel/ocaml-react \ ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl -USE_GITHUB= yes -GH_ACCOUNT= ocsigen - -MAKE_JOBS_UNSAFE= yes - USES= gmake USE_OCAML= yes OCAMLC_DEPEND= ocaml>=3.11:${OCAMLC_PORT} @@ -28,14 +24,11 @@ USE_OCAML_FINDLIB= yes USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --destdir "${STAGEDIR}" \ - --prefix "${PREFIX}" \ - --enable-camlp4 \ - --enable-ssl \ - --enable-react \ - --disable-libev \ - --disable-glib + +USE_GITHUB= yes +GH_ACCOUNT= ocsigen + +ALL_TARGET= default DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} @@ -48,24 +41,4 @@ DOCS_CONFIGURE_ON= --docdir ${STAGEDIR}${DOCSDIR} DOCS_BUILD_DEPENDS= ${SA_DIR}/text/text.a:textproc/ocaml-text DOCS_RUN_DEPENDS= ${SA_DIR}/text/text.a:textproc/ocaml-text -post-patch: - @${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \ - ${WRKSRC}/setup.ml - @${REINPLACE_CMD} -e 's,| O_CLOEXEC,& | O_KEEPEXEC, \ - ; s,else Unix\.socketpair ,&?cloexec:None,' \ - ${WRKSRC}/src/unix/lwt_unix.ml \ - ${WRKSRC}/src/unix/lwt_unix.mli - -do-configure: - cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS} - @${REINPLACE_CMD} -e 's%"-lev"%"-lev -L${PREFIX}/lib/ev -Wl,-R${PREFIX}/lib/ev"%' \ - ${WRKSRC}/setup.data - -do-build: - cd ${WRKSRC}; ocaml setup.ml -build - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR} - cd ${WRKSRC}; ocaml setup.ml -install - .include diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo index ed04d7d0d..df93ad744 100644 --- a/devel/ocaml-lwt/distinfo +++ b/devel/ocaml-lwt/distinfo @@ -1,2 +1,3 @@ -SHA256 (ocsigen-lwt-2.5.2_GH0.tar.gz) = b319514cf51656780a8f609a63ead08d3052a442546b218530ce146d37bf6331 -SIZE (ocsigen-lwt-2.5.2_GH0.tar.gz) = 268168 +TIMESTAMP = 1630294660 +SHA256 (ocsigen-lwt-5.4.2_GH0.tar.gz) = e169cbe6722d9364002e8107297a24c7479843cb88222fe3e179e58407c1d2cb +SIZE (ocsigen-lwt-5.4.2_GH0.tar.gz) = 304541 diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index 9ac948457..14196e4ca 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -1,7 +1,7 @@ # Created by: Jean-Sébastien Pédron PORTNAME= parmap -DISTVERSION= 1.0-rc9 +DISTVERSION= 1.2.3 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -17,11 +17,12 @@ USE_GITHUB= yes GH_ACCOUNT= rdicosmo USES= gmake -GNU_CONFIGURE= yes USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes +ALL_TARGET= default + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so diff --git a/devel/ocaml-parmap/distinfo b/devel/ocaml-parmap/distinfo index 29b6be795..3adf352c6 100644 --- a/devel/ocaml-parmap/distinfo +++ b/devel/ocaml-parmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519649954 -SHA256 (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 8bccdb269e955b7ae6ab981117bfe64abf0f832788e4138c79b83385c9c9e16a -SIZE (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 99394 +TIMESTAMP = 1630267147 +SHA256 (rdicosmo-parmap-1.2.3_GH0.tar.gz) = 40dab7e34e164cb4fa9541d64fd84f0b2f7bf0a7d0087efeb4a76f856273a165 +SIZE (rdicosmo-parmap-1.2.3_GH0.tar.gz) = 47481 diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index 727bc1a10..c349fe58a 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -1,33 +1,36 @@ # Created by: Stanislav Sedov PORTNAME= sexplib -PORTVERSION= 113.00.00 -MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/ +PORTVERSION= 0.14.0 +PORTEPOCH= 1 CATEGORIES= devel +MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/v${PORTVERSION:R}/files/ PKGNAMEPREFIX= ocaml- +DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OCaml library for working with S-expressions -LICENSE= APACHE20 BSD3CLAUSE -LICENSE_COMB= multi -LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt -LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv +BUILD_DEPENDS= dune:devel/ocaml-dune \ + ocaml-sexplib0>0:devel/ocaml-sexplib0 \ + ocaml-type_conv>=0:devel/ocaml-type_conv BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv -OPTIONS_DEFINE= DOCS - -CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes +USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes -USES= gmake + +CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} + +ALL_TARGET= default + +OPTIONS_DEFINE= DOCS DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix diff --git a/devel/ocaml-sexplib/distinfo b/devel/ocaml-sexplib/distinfo index 0ed067e03..856cec2f1 100644 --- a/devel/ocaml-sexplib/distinfo +++ b/devel/ocaml-sexplib/distinfo @@ -1,2 +1,3 @@ -SHA256 (sexplib-113.00.00.tar.gz) = df91f1b4aae3936856cbb00a621a2c40f6b56c06670e1513b2b60698ab8240e4 -SIZE (sexplib-113.00.00.tar.gz) = 136960 +TIMESTAMP = 1630257081 +SHA256 (sexplib-v0.14.0.tar.gz) = a2d2c5fdab67b37f06a5ae190de18ba4488d02894f09fd866d4e66e60cb3348b +SIZE (sexplib-v0.14.0.tar.gz) = 57154 diff --git a/devel/ocaml-sexplib0/Makefile b/devel/ocaml-sexplib0/Makefile index 6752d17ea..740df91ea 100644 --- a/devel/ocaml-sexplib0/Makefile +++ b/devel/ocaml-sexplib0/Makefile @@ -1,7 +1,5 @@ -# Created by: Stanislav Sedov - PORTNAME= sexplib0 -PORTVERSION= 0.14.0 +DISTVERSION= 0.14.0 CATEGORIES= devel MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/v${PORTVERSION:R}/files/ PKGNAMEPREFIX= ocaml- @@ -28,17 +26,13 @@ CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} ALL_TARGET= default -OPTIONS_DEFINE= DOCS +MAKE_ARGS= INSTALL_ARGS="--libdir=${OCAML_SITELIBDIR}" DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix -PORTDOCS= * post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sexplib0/sexplib0.cmxs - -xpost-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.cmxs + @${RM} -r ${STAGEDIR}${PREFIX}/doc .include diff --git a/devel/ocaml-sexplib0/pkg-plist b/devel/ocaml-sexplib0/pkg-plist deleted file mode 100644 index c7474d0cd..000000000 --- a/devel/ocaml-sexplib0/pkg-plist +++ /dev/null @@ -1,47 +0,0 @@ -doc/sexplib0/LICENSE.md -lib/sexplib0/META -lib/sexplib0/dune-package -lib/sexplib0/lazy_group_id.ml -lib/sexplib0/lazy_group_id.mli -lib/sexplib0/opam -lib/sexplib0/raw_grammar.ml -lib/sexplib0/sexp.ml -lib/sexplib0/sexp.mli -lib/sexplib0/sexp_conv.ml -lib/sexplib0/sexp_conv.mli -lib/sexplib0/sexp_conv_error.ml -lib/sexplib0/sexpable.ml -lib/sexplib0/sexplib0.a -lib/sexplib0/sexplib0.cma -lib/sexplib0/sexplib0.cmi -lib/sexplib0/sexplib0.cmt -lib/sexplib0/sexplib0.cmx -lib/sexplib0/sexplib0.cmxa -lib/sexplib0/sexplib0.cmxs -lib/sexplib0/sexplib0.ml -lib/sexplib0/sexplib0__.cmi -lib/sexplib0/sexplib0__.cmt -lib/sexplib0/sexplib0__.cmx -lib/sexplib0/sexplib0__.ml -lib/sexplib0/sexplib0__Lazy_group_id.cmi -lib/sexplib0/sexplib0__Lazy_group_id.cmt -lib/sexplib0/sexplib0__Lazy_group_id.cmti -lib/sexplib0/sexplib0__Lazy_group_id.cmx -lib/sexplib0/sexplib0__Raw_grammar.cmi -lib/sexplib0/sexplib0__Raw_grammar.cmt -lib/sexplib0/sexplib0__Raw_grammar.cmx -lib/sexplib0/sexplib0__Sexp.cmi -lib/sexplib0/sexplib0__Sexp.cmt -lib/sexplib0/sexplib0__Sexp.cmti -lib/sexplib0/sexplib0__Sexp.cmx -lib/sexplib0/sexplib0__Sexp_conv.cmi -lib/sexplib0/sexplib0__Sexp_conv.cmt -lib/sexplib0/sexplib0__Sexp_conv.cmti -lib/sexplib0/sexplib0__Sexp_conv.cmx -lib/sexplib0/sexplib0__Sexp_conv_error.cmi -lib/sexplib0/sexplib0__Sexp_conv_error.cmt -lib/sexplib0/sexplib0__Sexp_conv_error.cmx -lib/sexplib0/sexplib0__Sexpable.cmi -lib/sexplib0/sexplib0__Sexpable.cmt -lib/sexplib0/sexplib0__Sexpable.cmx -@dir %%OCAML_SITELIBDIR%% diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile index 8a782cf50..9228c0349 100644 --- a/devel/ocaml-uutf/Makefile +++ b/devel/ocaml-uutf/Makefile @@ -1,7 +1,7 @@ # Created by: Veniamin Gvozdikov PORTNAME= uutf -PORTVERSION= 0.9.4 +DISTVERSION= 1.0.2 CATEGORIES= devel MASTER_SITES= http://erratique.ch/software/uutf/releases/ PKGNAMEPREFIX= ocaml- @@ -9,13 +9,13 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Non-blocking streaming Unicode codec for OCaml -LICENSE= BSD3CLAUSE +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild USES= tar:tbz -USE_OCAML= yes - +USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes diff --git a/devel/ocaml-uutf/distinfo b/devel/ocaml-uutf/distinfo index dadbedfcb..a04fb1af4 100644 --- a/devel/ocaml-uutf/distinfo +++ b/devel/ocaml-uutf/distinfo @@ -1,2 +1,3 @@ -SHA256 (uutf-0.9.4.tbz) = 13706722a0037b167eef359bac68d5426d05f64aa308f44c1784aace9577e1b8 -SIZE (uutf-0.9.4.tbz) = 36987 +TIMESTAMP = 1630279771 +SHA256 (uutf-1.0.2.tbz) = e61a81f535e535b8772aa8ec4950939dd588b9337d4c9fec9743483c3ccda1db +SIZE (uutf-1.0.2.tbz) = 22420 diff --git a/devel/omake/Makefile b/devel/omake/Makefile index 44c022f34..2ef88859c 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -1,11 +1,10 @@ # Created by: Stanislav Sedov PORTNAME= omake -DISTVERSION= 0.9.8.6-0.rc1 -PORTREVISION= 4 +DISTVERSIONPREFIX= ${PORTNAME}- +DISTVERSION= 0.10.3-54 +DISTVERSIONSUFFIX= -g08b2a83 CATEGORIES= devel -MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \ - http://download.camlcity.org/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Flexible build system @@ -13,17 +12,19 @@ COMMENT= Flexible build system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||} +USES= ncurses readline USE_OCAML= yes + +USE_GITHUB= yes +GH_ACCOUNT= ocaml-omake + NO_OCAML_RUNDEPENDS=yes -USES= ncurses readline + MAKE_ENV= INSTALL_ROOT=${STAGEDIR} MAKE_JOBS_UNSAFE= yes INFO= omake-doc -OPTIONS_DEFINE= DOCS - .include post-patch: @@ -42,11 +43,9 @@ post-patch: s|cp -f -m 555|$$(BSD_INSTALL_PROGRAM)|' ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} -e 's| -j2 | |' ${WRKSRC}/Makefile -.if ${NCURSESBASE} == "/usr" -.for f in lib/configure/ncurses.om src/libmojave-external/cutil/lm_terminfo.c - @${REINPLACE_CMD} -E -e 's|ncurses/(term\.h)|\1|' ${WRKSRC}/${f} -.endfor -.endif + +do-configure: + cd ${WRKSRC} && ./configure do-test: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake check @@ -56,14 +55,4 @@ do-test: bench: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake bench -post-install: - @(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info \ - ${STAGEDIR}${PREFIX}/${INFO_PATH}) - @(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info-* \ - ${STAGEDIR}${PREFIX}/${INFO_PATH}) - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - .include diff --git a/devel/omake/distinfo b/devel/omake/distinfo index 1a850a445..9a6cebd90 100644 --- a/devel/omake/distinfo +++ b/devel/omake/distinfo @@ -1,2 +1,3 @@ -SHA256 (omake-0.9.8.6-0.rc1.tar.gz) = 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9 -SIZE (omake-0.9.8.6-0.rc1.tar.gz) = 3254283 +TIMESTAMP = 1630209541 +SHA256 (ocaml-omake-omake-omake-0.10.3-54-g08b2a83_GH0.tar.gz) = e5dc963033035a6fc4fd7a1ca94a6828c834436c42bbfa43f1879240dd6c9531 +SIZE (ocaml-omake-omake-omake-0.10.3-54-g08b2a83_GH0.tar.gz) = 1500856 diff --git a/devel/omake/pkg-plist b/devel/omake/pkg-plist index 8b6a2b886..41f9a1f18 100644 --- a/devel/omake/pkg-plist +++ b/devel/omake/pkg-plist @@ -1,4 +1,3 @@ -bin/cvs_realclean bin/omake bin/osh lib/omake/OMakefile.default @@ -14,7 +13,9 @@ lib/omake/configure/Configure.om lib/omake/configure/X.om lib/omake/configure/fam.om lib/omake/configure/fs_case_sensitive.om +lib/omake/configure/moncontrol.om lib/omake/configure/ncurses.om +lib/omake/configure/posix_spawn.om lib/omake/configure/readline.om lib/omake/configure/snprintf.om lib/omake/parse/C/Lex.om @@ -24,31 +25,3 @@ lib/omake/parse/LaTeX/Macros.om lib/omake/parse/LaTeX/Parse.om lib/omake/parse/LaTeX/Spell.om lib/omake/web/simple-xml.om -%%PORTDOCS%%%%DOCSDIR%%/omake-all-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake-autoconf.html -%%PORTDOCS%%%%DOCSDIR%%/omake-base.html -%%PORTDOCS%%%%DOCSDIR%%/omake-build-examples.html -%%PORTDOCS%%%%DOCSDIR%%/omake-build.html -%%PORTDOCS%%%%DOCSDIR%%/omake-contents.html -%%PORTDOCS%%%%DOCSDIR%%/omake-detail.html -%%PORTDOCS%%%%DOCSDIR%%/omake-doc.css -%%PORTDOCS%%%%DOCSDIR%%/omake-doc.html -%%PORTDOCS%%%%DOCSDIR%%/omake-fun-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake-grammar.html -%%PORTDOCS%%%%DOCSDIR%%/omake-language-examples.html -%%PORTDOCS%%%%DOCSDIR%%/omake-language-naming.html -%%PORTDOCS%%%%DOCSDIR%%/omake-language.html -%%PORTDOCS%%%%DOCSDIR%%/omake-obj-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake-option-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake-options.html -%%PORTDOCS%%%%DOCSDIR%%/omake-pervasives.html -%%PORTDOCS%%%%DOCSDIR%%/omake-quickstart.html -%%PORTDOCS%%%%DOCSDIR%%/omake-references.html -%%PORTDOCS%%%%DOCSDIR%%/omake-rules.html -%%PORTDOCS%%%%DOCSDIR%%/omake-shell.html -%%PORTDOCS%%%%DOCSDIR%%/omake-system.html -%%PORTDOCS%%%%DOCSDIR%%/omake-target-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake-toc.html -%%PORTDOCS%%%%DOCSDIR%%/omake-var-index.html -%%PORTDOCS%%%%DOCSDIR%%/omake.html -%%PORTDOCS%%%%DOCSDIR%%/osh.html diff --git a/lang/Makefile b/lang/Makefile index df6a0e048..5f59cd12c 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -210,7 +210,6 @@ SUBDIR += ocaml SUBDIR += ocaml-autoconf SUBDIR += ocaml-camlidl - SUBDIR += ocaml-nox11 SUBDIR += onyx SUBDIR += oo2c SUBDIR += opencoarrays diff --git a/math/teyjus/Makefile b/math/teyjus/Makefile index 05b9a169f..442552bbb 100644 --- a/math/teyjus/Makefile +++ b/math/teyjus/Makefile @@ -22,6 +22,10 @@ USE_GITHUB= yes EXES= tjcc tjdepend tjdis tjlink tjsim PLIST_FILES= ${EXES:S/^/bin\//} +pre-build: # un-vendor OCaml's headers to allow compatibility with different OCaml versions + @${RM} -r ${WRKSRC}/source/front/caml + @${RLN} ${LOCALBASE}/lib/ocaml/caml ${WRKSRC}/source/front/caml + do-build: @cd ${WRKSRC} && omake diff --git a/textproc/Makefile b/textproc/Makefile index 9ee9224e9..c7b69b770 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -477,6 +477,7 @@ SUBDIR += nuspell SUBDIR += nux SUBDIR += ny-aspell + SUBDIR += ocaml-csexp SUBDIR += ocaml-csv SUBDIR += ocaml-expat SUBDIR += ocaml-text diff --git a/textproc/htmlc/Makefile b/textproc/htmlc/Makefile index 1fb60712a..311451ba6 100644 --- a/textproc/htmlc/Makefile +++ b/textproc/htmlc/Makefile @@ -3,8 +3,10 @@ PORTNAME= htmlc PORTVERSION= 2.21.0 CATEGORIES= textproc -MASTER_SITES= http://htmlc.inria.fr/ \ - http://caml.inria.fr/distrib/bazar-ocaml/htmlc/ +MASTER_SITES= https://caml.inria.fr/distrib/bazar-ocaml/htmlc/ + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE MAINTAINER= beyert@cs.ucr.edu COMMENT= Text file generator diff --git a/textproc/htmlc/distinfo b/textproc/htmlc/distinfo index 4cfea822f..13e986fd3 100644 --- a/textproc/htmlc/distinfo +++ b/textproc/htmlc/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1630208439 SHA256 (htmlc-2.21.0.tgz) = eb56d8fd4a47df1c7f915b31aff19f74f405e498012c663e64c6704cf5a4cf88 SIZE (htmlc-2.21.0.tgz) = 118291 diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile index d3d684d7b..73b1e8306 100644 --- a/www/geneweb/Makefile +++ b/www/geneweb/Makefile @@ -1,9 +1,7 @@ # Created by: Hubert Tournier PORTNAME= geneweb -DISTVERSIONPREFIX= distrib- -DISTVERSION= 6-08 -PORTREVISION= 1 +DISTVERSION= 7.0.0.20210824 CATEGORIES= www MAINTAINER= alex@stangl.us @@ -11,21 +9,28 @@ COMMENT= Advanced genealogy software LICENSE= GPLv2 -BUILD_DEPENDS= ocamlc:lang/ocaml \ +BUILD_DEPENDS= dune:devel/ocaml-dune \ + ocamlc:lang/ocaml \ camlp5:devel/ocaml-camlp5 \ ocamlfind:devel/ocaml-findlib +USES= gmake + USE_GITHUB= yes GH_ACCOUNT= geneweb -GH_TAGNAME= 13c850a0cc3973daf7ae3e0772a1621f84052041 +GH_TAGNAME= fd1eac24 + +ALL_TARGET= build -HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes MAKE_ENV+= STAGEDIR=${STAGEDIR} SUB_FILES+= pkg-message USE_RC_SUBR= gwd +do-configure: + @cd ${WRKSRC} && ocaml ./configure.ml + post-install: (cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} distrib) ${INSTALL_DATA} ${WRKSRC}/etc/a.gwf ${STAGEDIR}${PREFIX}/share/geneweb diff --git a/www/geneweb/distinfo b/www/geneweb/distinfo index 91dd66b90..a3bd298e1 100644 --- a/www/geneweb/distinfo +++ b/www/geneweb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525699554 -SHA256 (geneweb-geneweb-distrib-6-08-13c850a0cc3973daf7ae3e0772a1621f84052041_GH0.tar.gz) = 79a062d83181c6a686794d2bb60577e963b26ff01154ac8ec4a3604c796f27e3 -SIZE (geneweb-geneweb-distrib-6-08-13c850a0cc3973daf7ae3e0772a1621f84052041_GH0.tar.gz) = 1793948 +TIMESTAMP = 1630225581 +SHA256 (geneweb-geneweb-7.0.0.20210824-fd1eac24_GH0.tar.gz) = e1f670190e6a84d0070e061a80ad548cdc7c82a147fa130af6c1193276ba4e9d +SIZE (geneweb-geneweb-7.0.0.20210824-fd1eac24_GH0.tar.gz) = 24351486 diff --git a/www/geneweb/files/patch-Makefile b/www/geneweb/files/patch-Makefile deleted file mode 100644 index 140d00668..000000000 --- a/www/geneweb/files/patch-Makefile +++ /dev/null @@ -1,65 +0,0 @@ ---- ./Makefile.orig 2013-03-01 03:06:49.000000000 UTC -+++ ./Makefile 2014-05-14 06:57:05.000000000 -@@ -1,8 +1,7 @@ - # $Id: Makefile,v 5.7 2009-03-11 10:53:30 ddr Exp $ - --PREFIX=/usr --LANGDIR=$(PREFIX)/share/geneweb --MANDIR=$(PREFIX)/man/man1 -+LANGDIR=$(STAGEDIR)$(PREFIX)/share/geneweb -+MANDIR=$(STAGEDIR)$(PREFIX)/man/man1 - DESTDIR=distribution - MANPAGES=ged2gwb.1 gwb2ged.1 gwc.1 gwc2.1 gwu.1 gwd.1 consang.1 gwsetup.1 - -@@ -29,16 +28,16 @@ - cd gwtp; $(MAKE) opt - - install: -- mkdir -p $(PREFIX)/bin -- cp src/gwc $(PREFIX)/bin/gwc$(EXE) -- cp src/gwc1 $(PREFIX)/bin/gwc1$(EXE) -- cp src/gwc2 $(PREFIX)/bin/gwc2$(EXE) -- cp src/consang $(PREFIX)/bin/consang$(EXE) -- cp src/gwd $(PREFIX)/bin/gwd$(EXE) -- cp src/gwu $(PREFIX)/bin/gwu$(EXE) -- cp ged2gwb/ged2gwb $(PREFIX)/bin/ged2gwb$(EXE) -- cp ged2gwb/ged2gwb2 $(PREFIX)/bin/ged2gwb2$(EXE) -- cp gwb2ged/gwb2ged $(PREFIX)/bin/gwb2ged$(EXE) -+ mkdir -p $(STAGEDIR)$(PREFIX)/bin -+ cp src/gwc $(STAGEDIR)$(PREFIX)/bin/gwc$(EXE) -+ cp src/gwc1 $(STAGEDIR)$(PREFIX)/bin/gwc1$(EXE) -+ cp src/gwc2 $(STAGEDIR)$(PREFIX)/bin/gwc2$(EXE) -+ cp src/consang $(STAGEDIR)$(PREFIX)/bin/consang$(EXE) -+ cp src/gwd $(STAGEDIR)$(PREFIX)/bin/gwd$(EXE) -+ cp src/gwu $(STAGEDIR)$(PREFIX)/bin/gwu$(EXE) -+ cp ged2gwb/ged2gwb $(STAGEDIR)$(PREFIX)/bin/ged2gwb$(EXE) -+ cp ged2gwb/ged2gwb2 $(STAGEDIR)$(PREFIX)/bin/ged2gwb2$(EXE) -+ cp gwb2ged/gwb2ged $(STAGEDIR)$(PREFIX)/bin/gwb2ged$(EXE) - mkdir -p $(LANGDIR)/lang - cp hd/lang/*.txt $(LANGDIR)/lang/. - mkdir -p $(LANGDIR)/images -@@ -52,15 +51,15 @@ - cd man; cp $(MANPAGES) $(MANDIR)/. - - uninstall: -- rm -f $(PREFIX)/bin/gwc$(EXE) -- rm -f $(PREFIX)/bin/gwc1$(EXE) -- rm -f $(PREFIX)/bin/gwc2$(EXE) -- rm -f $(PREFIX)/bin/consang$(EXE) -- rm -f $(PREFIX)/bin/gwd$(EXE) -- rm -f $(PREFIX)/bin/gwu$(EXE) -- rm -f $(PREFIX)/bin/ged2gwb$(EXE) -- rm -f $(PREFIX)/bin/gwb2ged$(EXE) -- rm -rf $(PREFIX)/share/geneweb -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc1$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc2$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/consang$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwd$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwu$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/ged2gwb$(EXE) -+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwb2ged$(EXE) -+ rm -rf $(STAGEDIR)$(PREFIX)/share/geneweb - cd $(MANDIR); rm -f $(MANPAGES) - - distrib: new_distrib wrappers diff --git a/www/geneweb/files/patch-configure b/www/geneweb/files/patch-configure deleted file mode 100644 index c6cdfd684..000000000 --- a/www/geneweb/files/patch-configure +++ /dev/null @@ -1,8 +0,0 @@ ---- configure.orig 2016-11-06 14:21:56 UTC -+++ configure -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - OCAML_MIN_VER="4.02" - diff --git a/www/geneweb/files/patch-dag2html__Makefile b/www/geneweb/files/patch-dag2html__Makefile deleted file mode 100644 index 2db268573..000000000 --- a/www/geneweb/files/patch-dag2html__Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- ./dag2html/Makefile.orig 2013-03-01 03:06:49.000000000 UTC -+++ ./dag2html/Makefile 2014-05-14 07:00:04.000000000 -@@ -1,7 +1,7 @@ - # $Id: Makefile,v 5.1 2007-07-11 16:15:21 ddr Exp $ - --BINDIR=/usr/local/bin --MANDIR=/usr/local/share/man/man1 -+BINDIR=$(STAGING)$(PREFIX)/bin -+MANDIR=$(STAGING)$(PREFIX)/share/man/man1 - OCAMLC=ocamlc - OCAMLOPT=ocamlopt - OCARGS= diff --git a/www/geneweb/files/patch-src__Makefile b/www/geneweb/files/patch-src__Makefile deleted file mode 100644 index 35ed89973..000000000 --- a/www/geneweb/files/patch-src__Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/Makefile.orig 2013-03-01 03:06:44.000000000 UTC -+++ ./src/Makefile 2014-05-13 23:46:54.000000000 -@@ -2,7 +2,6 @@ - - include ../tools/Makefile.inc - --PREFIX=/usr - OCAMLI=-I ../wserver -I ../dag2html - GWC_OBJS=argl.cmo lock.cmo adef.cmo iovalue.cmo buff.cmo name.cmo mutil.cmo secure.cmo btree.cmo futil.cmo dutil.cmo database.cmo db2.cmo db2disk.cmo diff.cmo outbase.cmo gwdb.cmo pqueue.cmo progrBar.cmo consang.cmo consangAll.cmo checkItem.cmo check.cmo calendar.cmo notesLinks.cmo gwcomp.cmo db1link.cmo gwc.cmo - GWC2_OBJS=calendar.cmo adef.cmo iovalue.cmo buff.cmo name.cmo mutil.cmo gwcomp.cmo argl.cmo lock.cmo progrBar.cmo secure.cmo iochan.cmo futil.cmo db2.cmo db2out.cmo notesLinks.cmo db2disk.cmo dutil.cmo btree.cmo database.cmo gwdb.cmo consang.cmo consangAll.cmo checkItem.cmo check.cmo db2link.cmo gwc2.cmo diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile index 32bb6d493..212b6c0a0 100644 --- a/x11-toolkits/ocaml-labltk/Makefile +++ b/x11-toolkits/ocaml-labltk/Makefile @@ -1,9 +1,8 @@ # Created by: Michael Grünewald PORTNAME= labltk -PORTVERSION= 8.06.3 +PORTVERSION= 8.06.10 CATEGORIES= x11-toolkits -MASTER_SITES= https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org @@ -12,11 +11,16 @@ COMMENT= Objective Caml interface to Tk LICENSE= LGPL20 USES= gmake tk -HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes MAKE_ENV+= STAGEDIR="${STAGEDIR}" USE_OCAML= yes +USE_GITHUB= yes +GH_ACCOUNT= garrigue +GH_PROJECT= labltk + +HAS_CONFIGURE= yes + ALL_TARGET= all opt post-patch: diff --git a/x11-toolkits/ocaml-labltk/distinfo b/x11-toolkits/ocaml-labltk/distinfo index 453a615ba..01a773b21 100644 --- a/x11-toolkits/ocaml-labltk/distinfo +++ b/x11-toolkits/ocaml-labltk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559830627 -SHA256 (labltk-8.06.3.tar.gz) = b6b7076f6a2a7b2f63095013cb4e37a1f2a6eb3d4abb57dbb1b8cff1ae4c6ae6 -SIZE (labltk-8.06.3.tar.gz) = 369924 +TIMESTAMP = 1630224504 +SHA256 (garrigue-labltk-8.06.10_GH0.tar.gz) = 745367755365b51ee2c5415654be6fa406e166a374f8d90cd8199091307b8d10 +SIZE (garrigue-labltk-8.06.10_GH0.tar.gz) = 371871 diff --git a/x11-toolkits/ocaml-labltk/pkg-plist b/x11-toolkits/ocaml-labltk/pkg-plist index 7842ae1df..ccc94199e 100644 --- a/x11-toolkits/ocaml-labltk/pkg-plist +++ b/x11-toolkits/ocaml-labltk/pkg-plist @@ -1,5 +1,6 @@ bin/labltk bin/ocamlbrowser +lib/ocaml/labltk/META lib/ocaml/labltk/balloon.cmi lib/ocaml/labltk/balloon.cmx lib/ocaml/labltk/balloon.mli @@ -127,6 +128,8 @@ lib/ocaml/labltk/cWm.cmx lib/ocaml/labltk/cWm.mli lib/ocaml/labltk/camltk.cmi lib/ocaml/labltk/camltk.cmx +lib/ocaml/labltk/camltkwrap.cmi +lib/ocaml/labltk/camltkwrap.cmx lib/ocaml/labltk/canvas.cmi lib/ocaml/labltk/canvas.cmx lib/ocaml/labltk/canvas.mli @@ -335,5 +338,4 @@ lib/ocaml/labltk/winfo.mli lib/ocaml/labltk/wm.cmi lib/ocaml/labltk/wm.cmx lib/ocaml/labltk/wm.mli -lib/ocaml/labltk/META lib/ocaml/stublibs/dlllabltk.so