Attachment 220275 Details for Bug 250408 – ocaml411-extras.patch (camlp4/5, labltk, findlib)

[patch] ocaml411-extras.patch (camlp4/5, labltk, findlib)

ocaml411-extras.patch (text/plain), 24.66 KB, created by Val Packett on 2020-12-05 11:07:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2020-12-05 11:07:28 UTC

Size: 24.66 KB

patch

obsolete

>diff --git c/devel/ocaml-camlp4/Makefile i/devel/ocaml-camlp4/Makefile
>index 07d08c901f6a..138f73ada782 100644
>--- c/devel/ocaml-camlp4/Makefile
>+++ i/devel/ocaml-camlp4/Makefile
>@@ -1,32 +1,32 @@
> # Created by: Michael GrÃ¼newald <michipili@gmail.com>
> # $FreeBSD$
> 
> PORTNAME=	camlp4
>-PORTVERSION=	4.05+2
>+PORTVERSION=	4.11+1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	michipili@gmail.com
> COMMENT=	System for writing extensible parsers for OCaml
> 
> LICENSE=	LGPL20
> 
> BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ocaml
> 
> USES=		gmake
> USE_OCAML=	yes
> HAS_CONFIGURE=	yes
> MAKE_ENV+=	DESTDIR="${STAGEDIR}"
> MAKE_JOBS_UNSAFE=yes
> ALL_TARGET=	all camlp4/META
> INSTALL_TARGET=	install install-META
> 
> post-install:
> .for f in camlp4o camlp4of camlp4oof camlp4orf camlp4r camlp4rf
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}.opt
> .endfor
> 
> .include <bsd.port.mk>
>diff --git c/devel/ocaml-camlp4/distinfo i/devel/ocaml-camlp4/distinfo
>index 058ba6be8a87..bb7acb214af1 100644
>--- c/devel/ocaml-camlp4/distinfo
>+++ i/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 = 1606916095
>+SHA256 (ocaml-camlp4-4.11+1_GH0.tar.gz) = a501c19e8e1e5057f382761f64658f921b8efed460ff42b8de0e1545f5613172
>+SIZE (ocaml-camlp4-4.11+1_GH0.tar.gz) = 650280
>diff --git c/devel/ocaml-camlp5/Makefile i/devel/ocaml-camlp5/Makefile
>index 44968a05da5f..1545471a9796 100644
>--- c/devel/ocaml-camlp5/Makefile
>+++ i/devel/ocaml-camlp5/Makefile
>@@ -1,51 +1,51 @@
> # Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
> # $FreeBSD$
> 
> PORTNAME=	camlp5
>-PORTVERSION=	7.07
>+PORTVERSION=	8.00+alpha06
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> DIST_SUBDIR=	${PKGBASE}
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Preprocessor-pretty-printer of OCaml
> 
> LICENSE=	INRIA
> 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 tar:tgz
> USE_GITHUB=	yes
>-GH_TAGNAME=	rel${PORTVERSION:S/.//}
>+GH_TAGNAME=	rel${PORTVERSION}
> USE_OCAML=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX}
> ALL_TARGET=	world.opt
> MAKE_JOBS_UNSAFE=yes
> 
> OPTIONS_SINGLE=		MODE
> OPTIONS_SINGLE_MODE=	TRANSITIONAL STRICT
> OPTIONS_DEFAULT=	STRICT
> TRANSITIONAL_DESC=	Compatible syntax tree with old versions
> 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
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/etc/META \
> 	    ${STAGEDIR}${PREFIX}/lib/ocaml/camlp5
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/camlp5*.opt \
> 	    ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/camlp5/*.o
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff --git c/devel/ocaml-camlp5/distinfo i/devel/ocaml-camlp5/distinfo
>index 2ff8c4ba9974..2051513a6db2 100644
>--- c/devel/ocaml-camlp5/distinfo
>+++ i/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 = 1606917302
>+SHA256 (ocaml-camlp5/camlp5-camlp5-8.00+alpha06-rel8.00+alpha06_GH0.tar.gz) = 55db4dcc4e7b3e3c6447bf6a076115810cbaf802e539c6210f51ff4048aa1e42
>+SIZE (ocaml-camlp5/camlp5-camlp5-8.00+alpha06-rel8.00+alpha06_GH0.tar.gz) = 1304383
>diff --git c/devel/ocaml-camlp5/pkg-plist i/devel/ocaml-camlp5/pkg-plist
>index 60b8267cd96f..95fa1f73de2f 100644
>--- c/devel/ocaml-camlp5/pkg-plist
>+++ i/devel/ocaml-camlp5/pkg-plist
>@@ -1,211 +1,250 @@
> bin/camlp5
> bin/camlp5o
> bin/camlp5o.opt
> bin/camlp5r
> bin/camlp5r.opt
> bin/camlp5sch
> bin/mkcamlp5
> 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
> lib/ocaml/camlp5/diff.cmi
> lib/ocaml/camlp5/diff.cmx
> lib/ocaml/camlp5/diff.mli
> lib/ocaml/camlp5/eprinter.cmi
> lib/ocaml/camlp5/eprinter.cmx
> lib/ocaml/camlp5/eprinter.mli
>+lib/ocaml/camlp5/exceptions.cmi
> lib/ocaml/camlp5/extfold.cmi
> lib/ocaml/camlp5/extfold.cmx
> lib/ocaml/camlp5/extfold.mli
> lib/ocaml/camlp5/extfun.cmi
> lib/ocaml/camlp5/extfun.cmx
> lib/ocaml/camlp5/extfun.mli
> lib/ocaml/camlp5/fstream.cmi
> lib/ocaml/camlp5/fstream.cmx
> lib/ocaml/camlp5/fstream.mli
> lib/ocaml/camlp5/gramext.cmi
> lib/ocaml/camlp5/gramext.cmx
> lib/ocaml/camlp5/gramext.mli
> lib/ocaml/camlp5/gramlib.a
> lib/ocaml/camlp5/gramlib.cma
> lib/ocaml/camlp5/gramlib.cmxa
> lib/ocaml/camlp5/grammar.cmi
> lib/ocaml/camlp5/grammar.cmx
> 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
> lib/ocaml/camlp5/odyl.cmo
> lib/ocaml/camlp5/odyl.cmx
> lib/ocaml/camlp5/odyl.cmxa
> lib/ocaml/camlp5/odyl.o
> lib/ocaml/camlp5/pa_extend.cmi
> lib/ocaml/camlp5/pa_extend.cmo
> lib/ocaml/camlp5/pa_extend.cmx
> lib/ocaml/camlp5/pa_extend.o
> lib/ocaml/camlp5/pa_extend_m.cmo
> lib/ocaml/camlp5/pa_extend_m.cmx
> lib/ocaml/camlp5/pa_extend_m.o
> lib/ocaml/camlp5/pa_extfold.cmo
> lib/ocaml/camlp5/pa_extfold.cmx
> lib/ocaml/camlp5/pa_extfold.o
> lib/ocaml/camlp5/pa_extfun.cmo
> lib/ocaml/camlp5/pa_extfun.cmx
> lib/ocaml/camlp5/pa_extfun.o
> lib/ocaml/camlp5/pa_extprint.cmo
> lib/ocaml/camlp5/pa_extprint.cmx
> lib/ocaml/camlp5/pa_extprint.o
> lib/ocaml/camlp5/pa_fstream.cmo
> lib/ocaml/camlp5/pa_fstream.cmx
> lib/ocaml/camlp5/pa_fstream.o
> lib/ocaml/camlp5/pa_lefteval.cmo
> lib/ocaml/camlp5/pa_lefteval.cmx
> lib/ocaml/camlp5/pa_lefteval.o
> lib/ocaml/camlp5/pa_lexer.cmo
> lib/ocaml/camlp5/pa_lexer.cmx
> lib/ocaml/camlp5/pa_lexer.o
> lib/ocaml/camlp5/pa_lisp.cmo
> lib/ocaml/camlp5/pa_lisp.cmx
> lib/ocaml/camlp5/pa_lisp.o
> 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
> lib/ocaml/camlp5/pa_mktest.cmo
> lib/ocaml/camlp5/pa_mktest.cmx
> lib/ocaml/camlp5/pa_mktest.o
> lib/ocaml/camlp5/pa_o.cmo
> lib/ocaml/camlp5/pa_o.cmx
> lib/ocaml/camlp5/pa_o.o
> lib/ocaml/camlp5/pa_o_fast.cmx
> lib/ocaml/camlp5/pa_o_fast.o
> lib/ocaml/camlp5/pa_oop.cmo
> lib/ocaml/camlp5/pa_oop.cmx
> lib/ocaml/camlp5/pa_oop.o
> lib/ocaml/camlp5/pa_op.cmo
> lib/ocaml/camlp5/pa_op.cmx
> lib/ocaml/camlp5/pa_op.o
> lib/ocaml/camlp5/pa_pprintf.cmo
> lib/ocaml/camlp5/pa_pprintf.cmx
> lib/ocaml/camlp5/pa_pprintf.o
> lib/ocaml/camlp5/pa_pragma.cmo
> lib/ocaml/camlp5/pa_pragma.cmx
> lib/ocaml/camlp5/pa_pragma.o
> lib/ocaml/camlp5/pa_r.cmo
> lib/ocaml/camlp5/pa_r.cmx
> lib/ocaml/camlp5/pa_r.o
> lib/ocaml/camlp5/pa_reloc.cmo
> lib/ocaml/camlp5/pa_reloc.cmx
> lib/ocaml/camlp5/pa_reloc.o
> lib/ocaml/camlp5/pa_rp.cmo
> lib/ocaml/camlp5/pa_rp.cmx
> 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
> lib/ocaml/camlp5/plexer.mli
> lib/ocaml/camlp5/plexing.cmi
> lib/ocaml/camlp5/plexing.cmx
> lib/ocaml/camlp5/plexing.mli
> lib/ocaml/camlp5/ploc.cmi
> lib/ocaml/camlp5/ploc.cmx
> lib/ocaml/camlp5/ploc.mli
>+lib/ocaml/camlp5/pp_MLast.cmi
>+lib/ocaml/camlp5/pp_outcometree.cmi
>+lib/ocaml/camlp5/pp_parsetree.cmi
> lib/ocaml/camlp5/pprintf.cmi
> lib/ocaml/camlp5/pprintf.cmx
> lib/ocaml/camlp5/pprintf.mli
>+lib/ocaml/camlp5/ppxprint.cma
>+lib/ocaml/camlp5/ppxprint_runtime.cmi
> lib/ocaml/camlp5/pr_depend.cmo
> lib/ocaml/camlp5/pr_depend.cmx
> lib/ocaml/camlp5/pr_depend.o
> lib/ocaml/camlp5/pr_dump.cmo
> lib/ocaml/camlp5/pr_dump.cmx
> lib/ocaml/camlp5/pr_dump.o
> lib/ocaml/camlp5/pr_extend.cmo
> lib/ocaml/camlp5/pr_extend.cmx
> lib/ocaml/camlp5/pr_extend.o
> lib/ocaml/camlp5/pr_extfun.cmo
> lib/ocaml/camlp5/pr_extfun.cmx
> lib/ocaml/camlp5/pr_extfun.o
> lib/ocaml/camlp5/pr_extprint.cmo
> lib/ocaml/camlp5/pr_extprint.cmx
> 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.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.cmo
> lib/ocaml/camlp5/pr_r.cmx
> lib/ocaml/camlp5/pr_r.o
> lib/ocaml/camlp5/pr_ro.cmo
> lib/ocaml/camlp5/pr_ro.cmx
> lib/ocaml/camlp5/pr_ro.o
> lib/ocaml/camlp5/pr_rp.cmo
> lib/ocaml/camlp5/pr_rp.cmx
> lib/ocaml/camlp5/pr_rp.o
> lib/ocaml/camlp5/pr_scheme.cmo
> lib/ocaml/camlp5/pr_scheme.cmx
> lib/ocaml/camlp5/pr_scheme.o
> lib/ocaml/camlp5/pr_schemep.cmo
> lib/ocaml/camlp5/pr_schemep.cmx
> lib/ocaml/camlp5/pr_schemep.o
> 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
> lib/ocaml/camlp5/stdpp.mli
> lib/ocaml/camlp5/token.cmi
> lib/ocaml/camlp5/token.cmx
> lib/ocaml/camlp5/token.mli
> lib/ocaml/camlp5/versdep.cmi
> lib/ocaml/camlp5/versdep.cmx
> man/man1/camlp5.1.gz
> man/man1/camlp5o.1.gz
> man/man1/camlp5o.opt.1.gz
> man/man1/camlp5r.1.gz
> man/man1/camlp5r.opt.1.gz
> man/man1/camlp5sch.1.gz
> man/man1/mkcamlp5.1.gz
> man/man1/mkcamlp5.opt.1.gz
> man/man1/ocpp5.1.gz
>diff --git c/devel/ocaml-findlib/Makefile i/devel/ocaml-findlib/Makefile
>index 37498b70face..2c7742f9d969 100644
>--- c/devel/ocaml-findlib/Makefile
>+++ i/devel/ocaml-findlib/Makefile
>@@ -1,61 +1,59 @@
> # Created by: ijliao
> # $FreeBSD$
> 
> PORTNAME=	findlib
>-PORTVERSION=	1.7.1
>+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
> 
>+BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
>+
> 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=	*
> 
> 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
> TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
> 
> .include <bsd.port.pre.mk>
> 
> 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
>-# Spacetime profiling is only available for native code on 64-bit targets
>-.if ${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 <bsd.port.post.mk>
>diff --git c/devel/ocaml-findlib/distinfo i/devel/ocaml-findlib/distinfo
>index bf3555519a1e..e1d4c3677736 100644
>--- c/devel/ocaml-findlib/distinfo
>+++ i/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 c/devel/ocaml-findlib/files/patch-Makefile i/devel/ocaml-findlib/files/patch-Makefile
>index 95459974581b..639d27a2de72 100644
>--- c/devel/ocaml-findlib/files/patch-Makefile
>+++ i/devel/ocaml-findlib/files/patch-Makefile
>@@ -1,64 +1,64 @@
>---- 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:
> -	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
> -	mkdir -p "$(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
>- 	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:
> -	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
> -	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
> -	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
> +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
> +	-cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
> +	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
>  
>  .PHONY: uninstall-doc
>  uninstall-doc:
>-@@ -86,7 +86,7 @@ uninstall-doc:
>+@@ -86,7 +86,7 @@
>  
>  .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 mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
>  
>  .PHONY: uninstall-meta
>  uninstall-meta:
>-@@ -94,9 +94,9 @@ uninstall-meta:
>+@@ -94,9 +94,9 @@
>  
>  .PHONY: install-config
>  install-config:
> -	mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
> -	@if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
> -	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)"
>  
>  .PHONY: uninstall-config
>  uninstall-config:
>diff --git c/devel/ocaml-findlib/files/patch-src_findlib_Makefile i/devel/ocaml-findlib/files/patch-src_findlib_Makefile
>index 1f91a4d5ba77..4b85e6ca396b 100644
>--- c/devel/ocaml-findlib/files/patch-src_findlib_Makefile
>+++ i/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.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 --
> +OCAML_LIBBIN=${PREFIX}/lib/ocaml
>  
>  
>  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
> -	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=`$(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 c/devel/ocaml-findlib/pkg-plist i/devel/ocaml-findlib/pkg-plist
>index 8d0cad0e5353..9fb06d553047 100644
>--- c/devel/ocaml-findlib/pkg-plist
>+++ i/devel/ocaml-findlib/pkg-plist
>@@ -1,53 +1,47 @@
> 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
>-%%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
> %%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
>diff --git c/x11-toolkits/ocaml-labltk/Makefile i/x11-toolkits/ocaml-labltk/Makefile
>index c1ac58a6ad38..048eaaa3c906 100644
>--- c/x11-toolkits/ocaml-labltk/Makefile
>+++ i/x11-toolkits/ocaml-labltk/Makefile
>@@ -1,39 +1,42 @@
> # Created by: Michael GrÃ¼newald <michipili@gmail.com>
> # $FreeBSD$
> 
> PORTNAME=	labltk
>-PORTVERSION=	8.06.3
>+DISTVERSION=	8.06.9
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
> PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	ports@FreeBSD.org
> 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
>+
> ALL_TARGET=	all opt
> 
> post-patch:
> 	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \
> 		-e 's/$$(INSTALLDIR)/$$(STAGEDIR)$$(INSTALLDIR)/g' \
> 		-e 's/$$(INSTALLBINDIR)/$$(STAGEDIR)$$(INSTALLBINDIR)/g' \
> 		-e 's/$$(STUBLIBDIR)/$$(STAGEDIR)$$(STUBLIBDIR)/g' \
> 		-e 's/mkdir /& -p /g'
> 	@${REINPLACE_CMD} -e 's|%%SCRIPTBASE%%|${PREFIX}/lib/ocaml/labltk/|g' \
> 		${WRKSRC}/lib/Makefile
> 
> pre-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/support/META ${STAGEDIR}${PREFIX}/lib/ocaml/${PORTNAME}
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/dlllabltk.so
> 
> .include <bsd.port.mk>
>diff --git c/x11-toolkits/ocaml-labltk/distinfo i/x11-toolkits/ocaml-labltk/distinfo
>index 453a615ba5e5..d2a7f3209a2f 100644
>--- c/x11-toolkits/ocaml-labltk/distinfo
>+++ i/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 = 1606917640
>+SHA256 (garrigue-labltk-8.06.9_GH0.tar.gz) = fd6ce713c9d7692aa6781f24fb17efe7840acde66c29d7d652e81da992ffef62
>+SIZE (garrigue-labltk-8.06.9_GH0.tar.gz) = 371504

Actions: View | Diff

Attachments on bug 250408: 218814 | 218815 | 218816 | 220083 | 220275 | 227544 | 227555 | 227577