starship: Clean up rust libc dependency

[Michael-John Turner <mj%mjturner.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael-John Turner <mj%mjturner.net@localhost>
Pushed By:	mj
Date:		Thu Jul 8 12:30:18 2021 +0100
Changeset:	85e1ca6387d468979243aedc21a063e6284ced25

Modified Files:
	starship/Makefile
	starship/cargo-depends.mk
	starship/distinfo
	starship/patches/patch-Cargo.toml

Log Message:
starship: Clean up rust libc dependency

Remove dependency on specific rust libc commit, add dependency on
rust libc 0.2.78.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=85e1ca6387d468979243aedc21a063e6284ced25

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 starship/Makefile                 |  8 --------
 starship/cargo-depends.mk         |  2 +-
 starship/distinfo                 | 10 +++++-----
 starship/patches/patch-Cargo.toml | 10 +---------
 4 files changed, 7 insertions(+), 23 deletions(-)

diffs:
diff --git a/starship/Makefile b/starship/Makefile
index c3b0998f13..0c39d633b5 100644
--- a/starship/Makefile
+++ b/starship/Makefile
@@ -13,11 +13,6 @@ LICENSE=	isc
 # The libc and rust-battery crates currently have limited platform support
 ONLY_FOR_PLATFORM=	Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
 
-LIBC_REV=	c4ae71f5e120336e50c84dbc80523efa3883d29e
-DISTFILES=	${DEFAULT_DISTFILES}
-DISTFILES+=	libc-${LIBC_REV}.tar.gz
-SITES.libc-${LIBC_REV}.tar.gz+=	-${MASTER_SITE_GITHUB:=rust-lang/}libc/archive/${LIBC_REV}.tar.gz
-
 USE_LANGUAGES=			c
 USE_TOOLS+=			pkg-config
 
@@ -38,9 +33,6 @@ CARGO_FEATURES+=	battery
 
 INSTALLATION_DIRS=	bin
 
-post-extract:
-	mv ${WRKDIR}/libc-* ${WRKSRC}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/starship ${DESTDIR}${PREFIX}/bin
 
diff --git a/starship/cargo-depends.mk b/starship/cargo-depends.mk
index f802688a53..422ac6dd6a 100644
--- a/starship/cargo-depends.mk
+++ b/starship/cargo-depends.mk
@@ -84,7 +84,7 @@ CARGO_CRATE_DEPENDS+=	lazy_static-1.4.0
 CARGO_CRATE_DEPENDS+=	lazycell-1.3.0
 CARGO_CRATE_DEPENDS+=	lexical-core-0.7.6
 # Disabled as we need newer version containing NetBSD fix
-#CARGO_CRATE_DEPENDS+=	libc-0.2.95
+CARGO_CRATE_DEPENDS+=	libc-0.2.98
 CARGO_CRATE_DEPENDS+=	libgit2-sys-0.12.21+1.1.0
 CARGO_CRATE_DEPENDS+=	libz-sys-1.1.3
 CARGO_CRATE_DEPENDS+=	linked-hash-map-0.5.4
diff --git a/starship/distinfo b/starship/distinfo
index 1035784723..3bfa137aae 100644
--- a/starship/distinfo
+++ b/starship/distinfo
@@ -332,10 +332,10 @@ SHA1 (lexical-core-0.7.6.crate) = 2f3fdb37b0eaead5a53f90aaee83a03528021fc9
 RMD160 (lexical-core-0.7.6.crate) = 6cf77e9763b54ae04af64d096151ad4bb41368ac
 SHA512 (lexical-core-0.7.6.crate) = fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
 Size (lexical-core-0.7.6.crate) = 494385 bytes
-SHA1 (libc-c4ae71f5e120336e50c84dbc80523efa3883d29e.tar.gz) = f04d4c9e84443c814ecc8d60177340b20217eb4f
-RMD160 (libc-c4ae71f5e120336e50c84dbc80523efa3883d29e.tar.gz) = 7b52c6a6c2d048dd38944ec0a91b0d25b3a67641
-SHA512 (libc-c4ae71f5e120336e50c84dbc80523efa3883d29e.tar.gz) = b0098621e5d2e81d2de2901d526185d52c50c12dc48a6af24b95a112b8b693674af74767b71ec1c46136b0cea4f8bcde29e6eb4be16b57f7405f21d58e3a5d72
-Size (libc-c4ae71f5e120336e50c84dbc80523efa3883d29e.tar.gz) = 652019 bytes
+SHA1 (libc-0.2.98.crate) = d7ca526a6ea4720307b9930dde2d658712a0f4ad
+RMD160 (libc-0.2.98.crate) = ef6a691ff67ebe85b6d41d330e0c628588b0c030
+SHA512 (libc-0.2.98.crate) = 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
+Size (libc-0.2.98.crate) = 522087 bytes
 SHA1 (libgit2-sys-0.12.21+1.1.0.crate) = 3411afbebe922f5ae1304f09571a055b60d63889
 RMD160 (libgit2-sys-0.12.21+1.1.0.crate) = ec40c809112a873bf1377a674925f163c8cdfd23
 SHA512 (libgit2-sys-0.12.21+1.1.0.crate) = fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
@@ -892,4 +892,4 @@ SHA1 (zvariant_derive-2.6.0.crate) = 39e523fb60ebf8766bbfcb88abae52206fc08eef
 RMD160 (zvariant_derive-2.6.0.crate) = 9755915cda745c91f0b8106d8fdcfbe46f4f46c3
 SHA512 (zvariant_derive-2.6.0.crate) = 5392e9b27ea685e4ce0c76a92e03b3e9c85c81f6f7b117ad65365ebe8f11ab394e790776f448fc35c1c62c3b3b25826fc8609e62a275ada97524f3b97e57189c
 Size (zvariant_derive-2.6.0.crate) = 6857 bytes
-SHA1 (patch-Cargo.toml) = 3d6dd4a41151f40684dffe3fa97799be34c0012f
+SHA1 (patch-Cargo.toml) = 0668cd13d2063c92079b3025b1ae3765fbeac05d
diff --git a/starship/patches/patch-Cargo.toml b/starship/patches/patch-Cargo.toml
index 351a6b2fe2..3fd9f7da4a 100644
--- a/starship/patches/patch-Cargo.toml
+++ b/starship/patches/patch-Cargo.toml
@@ -8,15 +8,7 @@ Use libc that contains improved NetBSD support
  
  
  [dependencies]
-+libc = "0.2.97"
++libc = "0.2.98"
  clap = "2.33.3"
  ansi_term = "0.12.1"
  dirs-next = "2.0.0"
-@@ -102,3 +103,7 @@ lto = true
- [[bin]]
- name = "starship"
- path = "src/main.rs"
-+
-+[patch.crates-io]
-+libc = { path = 'libc-c4ae71f5e120336e50c84dbc80523efa3883d29e' }
-+