Date: Fri, 24 May 2019 07:57:11 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502426 - head/Mk/Uses Message-ID: <201905240757.x4O7vBjD000468@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri May 24 07:57:11 2019 New Revision: 502426 URL: https://svnweb.freebsd.org/changeset/ports/502426 Log: Mk/Uses/cargo.mk: QoL improvement during makepatch Cargo normalizes Cargo.toml when crates are published. It creates a Cargo.toml.orig to preserve the original. Rename them to not interfere with makepatch and avoid creating a bunch of useless and wrong files/patch-*Cargo.toml. Suggested by: mat Modified: head/Mk/Uses/cargo.mk Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Fri May 24 07:18:19 2019 (r502425) +++ head/Mk/Uses/cargo.mk Fri May 24 07:57:11 2019 (r502426) @@ -198,6 +198,10 @@ cargo-extract: @${PRINTF} '{"package":"%s","files":{}}' \ $$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}.tar.gz) \ > ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json + @if [ -r ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig ]; then \ + ${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \ + ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig-cargo; \ + fi .endfor _CARGO_GIT_PATCH_CARGOTOML=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905240757.x4O7vBjD000468>