From ff56220a01a802fbb30c9373175e7d3807ca4e56 Mon Sep 17 00:00:00 2001 From: Dmitri Goutnik Date: Fri, 4 Sep 2020 18:28:07 +0000 Subject: [PATCH] devel/cargo-generate: Remove openssl-src cargo crate - Address check-sanity stage message by removing vendored copy of OpenSSL. - Whilst here, pet portclippy. PR: 249103 Submitted by: Lewis Cook (maintainer) --- devel/cargo-generate/Makefile | 5 ++--- devel/cargo-generate/distinfo | 4 +--- devel/cargo-generate/files/patch-Cargo.toml | 12 ++++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 devel/cargo-generate/files/patch-Cargo.toml diff --git a/devel/cargo-generate/Makefile b/devel/cargo-generate/Makefile index e8528050f187..eb434fe3ecac 100644 --- a/devel/cargo-generate/Makefile +++ b/devel/cargo-generate/Makefile @@ -3,6 +3,7 @@ PORTNAME= cargo-generate DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= vulcan@wired.sh @@ -18,7 +19,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libssh2.so:security/libssh2 USES= cargo ssl - USE_GITHUB= yes GH_ACCOUNT= ashleygwilliams @@ -133,7 +133,6 @@ CARGO_CRATES= adler32-1.0.4 \ opaque-debug-0.2.3 \ openssl-0.10.25 \ openssl-probe-0.1.2 \ - openssl-src-111.6.0+1.1.1d \ openssl-sys-0.9.52 \ parking_lot-0.9.0 \ parking_lot_core-0.6.2 \ @@ -229,9 +228,9 @@ CARGO_CRATES= adler32-1.0.4 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-1.0.2 +PLIST_FILES= bin/${PORTNAME} PORTDOCS= CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md README.md \ TEMPLATES.md -PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= DOCS diff --git a/devel/cargo-generate/distinfo b/devel/cargo-generate/distinfo index a63269e2765e..7fb25787eac3 100644 --- a/devel/cargo-generate/distinfo +++ b/devel/cargo-generate/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1579463692 +TIMESTAMP = 1599239154 SHA256 (rust/crates/adler32-1.0.4.tar.gz) = 5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2 SIZE (rust/crates/adler32-1.0.4.tar.gz) = 5105 SHA256 (rust/crates/aho-corasick-0.6.10.tar.gz) = 81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5 @@ -221,8 +221,6 @@ SHA256 (rust/crates/openssl-0.10.25.tar.gz) = 2f372b2b53ce10fb823a337aaa674e3a7d SIZE (rust/crates/openssl-0.10.25.tar.gz) = 185164 SHA256 (rust/crates/openssl-probe-0.1.2.tar.gz) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de SIZE (rust/crates/openssl-probe-0.1.2.tar.gz) = 6427 -SHA256 (rust/crates/openssl-src-111.6.0+1.1.1d.tar.gz) = b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c -SIZE (rust/crates/openssl-src-111.6.0+1.1.1d.tar.gz) = 5076804 SHA256 (rust/crates/openssl-sys-0.9.52.tar.gz) = c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc SIZE (rust/crates/openssl-sys-0.9.52.tar.gz) = 45059 SHA256 (rust/crates/parking_lot-0.9.0.tar.gz) = f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252 diff --git a/devel/cargo-generate/files/patch-Cargo.toml b/devel/cargo-generate/files/patch-Cargo.toml new file mode 100644 index 000000000000..e69a638b383e --- /dev/null +++ b/devel/cargo-generate/files/patch-Cargo.toml @@ -0,0 +1,12 @@ +--- Cargo.toml.orig 2020-09-04 12:25:25 UTC ++++ Cargo.toml +@@ -37,9 +37,6 @@ predicates = "0.5.0" + assert_cmd = "0.4" + tempfile = "3.0.2" + +-[features] +-vendored-openssl = ['openssl/vendored'] +- + [[bin]] + path = "src/main.rs" + name = "cargo-generate"