svn commit: r504405 - head/devel/ocaml-dune

Alexey Dokuchaev danfe at FreeBSD.org
Mon Jun 17 09:58:43 UTC 2019


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 <bsd.port.mk>


More information about the svn-ports-all mailing list