From owner-svn-ports-all@freebsd.org Mon Jun 17 09:58:43 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CFAB15B3210; Mon, 17 Jun 2019 09:58:43 +0000 (UTC) (envelope-from danfe@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C2A8C87EB7; Mon, 17 Jun 2019 09:58:42 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 986FB23FB4; Mon, 17 Jun 2019 09:58:42 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5H9wg8x048446; Mon, 17 Jun 2019 09:58:42 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5H9wgtq048445; Mon, 17 Jun 2019 09:58:42 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201906170958.x5H9wgtq048445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 17 Jun 2019 09:58:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504405 - head/devel/ocaml-dune X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/devel/ocaml-dune X-SVN-Commit-Revision: 504405 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C2A8C87EB7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2019 09:58:43 -0000 Author: danfe Date: Mon Jun 17 09:58:42 2019 New Revision: 504405 URL: https://svnweb.freebsd.org/changeset/ports/504405 Log: - Pass down relative ${OCAML_SITELIBDIR}, it is handled correctly - Respect our ${OCAML_DOCSDIR}, in a somewhat hacking way for now Modified: head/devel/ocaml-dune/Makefile Modified: head/devel/ocaml-dune/Makefile ============================================================================== --- head/devel/ocaml-dune/Makefile Mon Jun 17 09:08:21 2019 (r504404) +++ head/devel/ocaml-dune/Makefile Mon Jun 17 09:58:42 2019 (r504405) @@ -3,7 +3,7 @@ PORTNAME= dune PORTVERSION= 1.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -19,14 +19,17 @@ USE_OCAML= yes USE_OCAML_FINDLIB= yes ALL_TARGET= release -MAKE_ENV= LIBDIR="${OCAMLFIND_DESTDIR}" +MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}" +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= CHANGES.md LICENSE.md README.md OPTIONS_DEFINE= DOCS -post-install: - @${MV} ${STAGEDIR}${PREFIX}/doc/dune ${STAGEDIR}${DOCSDIR} - @${RMDIR} ${STAGEDIR}${PREFIX}/doc +post-patch: +# FreeBSD-specific hack, do not nag upstream (for now) + @${REINPLACE_CMD} -e '/let doc_root/ \ + s:"doc:"${OCAML_DOCSDIR:S,^${PREFIX}/,,}:' \ + ${WRKSRC}/src/install.ml .include