Date: Sat, 2 Jul 2016 19:06:35 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417938 - head/lang/rust Message-ID: <201607021906.u62J6ZSM057357@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Jul 2 19:06:34 2016 New Revision: 417938 URL: https://svnweb.freebsd.org/changeset/ports/417938 Log: Add DOCS OPTION for html docs, bump PORTREVISION PR: 210613 Reported by: beyert@cs.ucr.edu Reviewed by: riggs, marino, jbeich Differential Revision: https://reviews.freebsd.org/D7050 Modified: head/lang/rust/Makefile head/lang/rust/pkg-plist Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Sat Jul 2 16:54:22 2016 (r417937) +++ head/lang/rust/Makefile Sat Jul 2 19:06:34 2016 (r417938) @@ -3,6 +3,7 @@ PORTNAME= rust PORTVERSION?= 1.9.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/stage0-snapshots/:bootstrap \ @@ -60,19 +61,22 @@ PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit python:2,build HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-valgrind --disable-docs \ +CONFIGURE_ARGS= --disable-valgrind \ ${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \ --mandir=${MANPREFIX}/man \ --release-channel=${RUST_CHANNEL} +PORTDOCS= * + .if defined(BATCH) || defined(PACKAGE_BUILDING) MAKE_ARGS+= VERBOSE=1 .endif -OPTIONS_DEFINE= GDB LLNEXTGEN PORT_LLVM +OPTIONS_DEFINE= DOCS GDB LLNEXTGEN PORT_LLVM GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification +DOCS_CONFIGURE_ENABLE= docs GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen @@ -141,6 +145,16 @@ pre-install: ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh +pre-install-DOCS-on: + @for f in manifest-rust-docs; do \ + if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \ + ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ + < ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \ + | ${XARGS} ${RM}; \ + fi; \ + done + @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-docs + post-install: @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ @@ -156,4 +170,12 @@ post-install: ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so +post-install-DOCS-on: + @for f in manifest-rust-docs; do \ + ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ + ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \ + ${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \ + done + @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/rust/html/extra + .include <bsd.port.mk> Modified: head/lang/rust/pkg-plist ============================================================================== --- head/lang/rust/pkg-plist Sat Jul 2 16:54:22 2016 (r417937) +++ head/lang/rust/pkg-plist Sat Jul 2 19:06:34 2016 (r417938) @@ -39,6 +39,7 @@ lib/rustlib/components lib/rustlib/etc/debugger_pretty_printers_common.py lib/rustlib/etc/gdb_load_rust_pretty_printers.py lib/rustlib/etc/gdb_rust_pretty_printing.py +%%PORTDOCS%%lib/rustlib/manifest-rust-docs lib/rustlib/manifest-rust-std-%%RUST_TARGET%% lib/rustlib/manifest-rustc lib/rustlib/rust-installer-version @@ -93,7 +94,3 @@ lib/rustlib/%%RUST_TARGET%%/lib/libtest- lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.so man/man1/rustc.1.gz man/man1/rustdoc.1.gz -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-APACHE -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIT -%%PORTDOCS%%%%DOCSDIR%%/README.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607021906.u62J6ZSM057357>