Attachment #246053 for bug #267469




PORTNAME=	gitui
DISTVERSIONPREFIX=	v
DISTVERSION=	0.24.3	# After update, `make patch` and `make cargo-crates > Makefile.crates` to avoid fetching vendored openssl-src
PORTREVISION=	2
CATEGORIES=	devel

MAINTAINER=	yuri@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE.md

BROKEN_armv7=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
BROKEN_i386=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
BROKEN_powerpc=	error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80

BUILD_DEPENDS=	bash:shells/bash \
		gmake:devel/gmake
LIB_DEPENDS=	libgit2.so:devel/libgit2 \
		libssh2.so:security/libssh2

USES=		cargo localbase:ldflags perl5 pkgconfig python:build ssl xorg
USE_XORG=	xcb

USE_GITHUB=	yes
GH_ACCOUNT=	extrawurst

CARGO_CRATES=	addr2line-0.19.0 \
		adler-1.0.2 \
		aho-corasick-1.0.2 \
		android-tzdata-0.1.1 \
		android_system_properties-0.1.5 \
		anstream-0.5.0 \
		anstyle-1.0.2 \
		anstyle-parse-0.2.1 \
		anstyle-query-1.0.0 \
		anstyle-wincon-2.1.0 \
		anyhow-1.0.75 \
		autocfg-1.1.0 \
		backtrace-0.3.67 \
		base64-0.13.1 \
		bincode-1.3.3 \
		bit-set-0.5.3 \
		bit-vec-0.6.3 \
		bitflags-1.3.2 \
		bugreport-0.5.0 \
		bumpalo-3.12.0 \
		bwrap-1.3.0 \
		bytesize-1.3.0 \
		cassowary-0.3.0 \
		cc-1.0.79 \
		cfg-if-1.0.0 \
		chrono-0.4.30 \
		clap-4.4.2 \
		clap_builder-4.4.2 \
		clap_lex-0.5.1 \
		codespan-reporting-0.11.1 \
		colorchoice-1.0.0 \
		core-foundation-sys-0.8.3 \
		crc32fast-1.3.2 \
		crossbeam-channel-0.5.8 \
		crossbeam-deque-0.8.2 \
		crossbeam-epoch-0.9.13 \
		crossbeam-utils-0.8.14 \
		crossterm-0.26.1 \
		crossterm_winapi-0.9.0 \
		cxx-1.0.90 \
		cxx-build-1.0.90 \
		cxxbridge-flags-1.0.90 \
		cxxbridge-macro-1.0.90 \
		dashmap-5.4.0 \
		diff-0.1.13 \
		dirs-5.0.1 \
		dirs-sys-0.4.1 \
		easy-cast-0.5.2 \
		either-1.8.1 \
		env_logger-0.10.0 \
		errno-0.2.8 \
		errno-dragonfly-0.1.2 \
		fancy-regex-0.11.0 \
		fastrand-1.9.0 \
		filetime-0.2.20 \
		flate2-1.0.25 \
		fnv-1.0.7 \
		form_urlencoded-1.2.0 \
		fsevent-sys-4.1.0 \
		futures-0.3.26 \
		futures-channel-0.3.26 \
		futures-core-0.3.26 \
		futures-executor-0.3.26 \
		futures-io-0.3.26 \
		futures-sink-0.3.26 \
		futures-task-0.3.26 \
		futures-util-0.3.26 \
		fuzzy-matcher-0.3.7 \
		getrandom-0.2.8 \
		gh-emoji-1.0.7 \
		gimli-0.27.3 \
		git-version-0.3.5 \
		git-version-macro-0.3.5 \
		git2-0.17.2 \
		hashbrown-0.12.3 \
		hermit-abi-0.3.2 \
		humantime-2.1.0 \
		iana-time-zone-0.1.53 \
		iana-time-zone-haiku-0.1.1 \
		idna-0.4.0 \
		indexmap-1.9.3 \
		inotify-0.9.6 \
		inotify-sys-0.1.5 \
		instant-0.1.12 \
		io-lifetimes-1.0.5 \
		is-terminal-0.4.3 \
		itertools-0.11.0 \
		itoa-1.0.8 \
		jobserver-0.1.25 \
		js-sys-0.3.61 \
		kqueue-1.0.7 \
		kqueue-sys-1.0.3 \
		lazy_static-1.4.0 \
		libc-0.2.139 \
		libgit2-sys-0.15.2+1.6.4 \
		libssh2-sys-0.3.0 \
		libz-sys-1.1.8 \
		link-cplusplus-1.0.8 \
		linux-raw-sys-0.1.4 \
		lock_api-0.4.10 \
		log-0.4.20 \
		memchr-2.5.0 \
		memoffset-0.7.1 \
		miniz_oxide-0.6.2 \
		mio-0.8.5 \
		notify-5.2.0 \
		notify-debouncer-mini-0.2.1 \
		num-traits-0.2.15 \
		num_cpus-1.16.0 \
		object-0.30.3 \
		once_cell-1.18.0 \
		onig-6.4.0 \
		onig_sys-69.8.1 \
		openssl-probe-0.1.5 \
		openssl-src-300.1.3+3.1.2 \
		openssl-sys-0.9.93 \
		option-ext-0.2.0 \
		parking_lot-0.12.1 \
		parking_lot_core-0.9.7 \
		percent-encoding-2.3.0 \
		phf-0.11.1 \
		phf_shared-0.11.1 \
		pin-project-lite-0.2.9 \
		pin-utils-0.1.0 \
		pkg-config-0.3.26 \
		pretty_assertions-1.4.0 \
		proc-macro-error-1.0.4 \
		proc-macro-error-attr-1.0.4 \
		proc-macro-hack-0.5.20+deprecated \
		proc-macro2-1.0.63 \
		quote-1.0.29 \
		ratatui-0.21.0 \
		rayon-1.7.0 \
		rayon-core-1.11.0 \
		redox_syscall-0.2.16 \
		redox_users-0.4.3 \
		regex-1.9.1 \
		regex-automata-0.3.4 \
		regex-syntax-0.7.4 \
		ron-0.8.0 \
		rustc-demangle-0.1.21 \
		rustix-0.36.8 \
		ryu-1.0.14 \
		same-file-1.0.6 \
		scopeguard-1.2.0 \
		scratch-1.0.3 \
		serde-1.0.156 \
		serde_derive-1.0.156 \
		serde_json-1.0.93 \
		serial_test-1.0.0 \
		serial_test_derive-1.0.0 \
		shell-escape-0.1.5 \
		shellexpand-3.1.0 \
		signal-hook-0.3.15 \
		signal-hook-mio-0.2.3 \
		signal-hook-registry-1.4.1 \
		simplelog-0.12.1 \
		siphasher-0.3.10 \
		slab-0.4.8 \
		smallvec-1.11.0 \
		strsim-0.10.0 \
		struct-patch-0.2.3 \
		struct-patch-derive-0.2.3 \
		syn-1.0.107 \
		syntect-5.1.0 \
		sys-info-0.9.1 \
		tempfile-3.4.0 \
		termcolor-1.2.0 \
		thiserror-1.0.39 \
		thiserror-impl-1.0.39 \
		thread_local-1.1.7 \
		time-0.3.22 \
		time-core-0.1.1 \
		time-macros-0.2.9 \
		tinyvec-1.6.0 \
		tinyvec_macros-0.1.1 \
		unicode-bidi-0.3.10 \
		unicode-ident-1.0.6 \
		unicode-normalization-0.1.22 \
		unicode-segmentation-1.10.1 \
		unicode-truncate-0.2.0 \
		unicode-width-0.1.10 \
		url-2.4.1 \
		utf8parse-0.2.1 \
		vcpkg-0.2.15 \
		version_check-0.9.4 \
		walkdir-2.3.3 \
		wasi-0.11.0+wasi-snapshot-preview1 \
		wasm-bindgen-0.2.84 \
		wasm-bindgen-backend-0.2.84 \
		wasm-bindgen-macro-0.2.84 \
		wasm-bindgen-macro-support-0.2.84 \
		wasm-bindgen-shared-0.2.84 \
		which-4.4.0 \
		winapi-0.3.9 \
		winapi-i686-pc-windows-gnu-0.4.0 \
		winapi-util-0.1.5 \
		winapi-x86_64-pc-windows-gnu-0.4.0 \
		windows-sys-0.42.0 \
		windows-sys-0.45.0 \
		windows-sys-0.48.0 \
		windows-targets-0.42.1 \
		windows-targets-0.48.1 \
		windows_aarch64_gnullvm-0.42.1 \
		windows_aarch64_gnullvm-0.48.0 \
		windows_aarch64_msvc-0.42.1 \
		windows_aarch64_msvc-0.48.0 \
		windows_i686_gnu-0.42.1 \
		windows_i686_gnu-0.48.0 \
		windows_i686_msvc-0.42.1 \
		windows_i686_msvc-0.48.0 \
		windows_x86_64_gnu-0.42.1 \
		windows_x86_64_gnu-0.48.0 \
		windows_x86_64_gnullvm-0.42.1 \
		windows_x86_64_gnullvm-0.48.0 \
		windows_x86_64_msvc-0.42.1 \
		windows_x86_64_msvc-0.48.0 \
		yansi-0.5.1
RUSTFLAGS+=	--cap-lints=warn
PLIST_FILES=	bin/${PORTNAME}

BINARY_ALIAS=	python3=${PYTHON_CMD} # xcb requires python3

# Fix build on armv7, i386 and powerpc
# sys-info-0.9.1 crate issue: https://github.com/FillZpp/sys-info-rs/issues/80
post-patch:
	@${REINPLACE_CMD} \
	-e '/get_cpu/s|unsigned long|uint64_t|' \
	-e '/get_proc_total/s|unsigned long|uint64_t|' \
	${WRKSRC}/cargo-crates/sys-info-0.9.1/c/*.[ch]

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}





CARGO_CRATES=	addr2line-0.19.0 \
		adler-1.0.2 \
		aho-corasick-1.0.2 \
		android-tzdata-0.1.1 \
		android_system_properties-0.1.5 \
		anstream-0.5.0 \
		anstyle-1.0.2 \
		anstyle-parse-0.2.1 \
		anstyle-query-1.0.0 \
		anstyle-wincon-2.1.0 \
		anyhow-1.0.75 \
		autocfg-1.1.0 \
		backtrace-0.3.67 \
		base64-0.13.1 \
		bincode-1.3.3 \
		bit-set-0.5.3 \
		bit-vec-0.6.3 \
		bitflags-1.3.2 \
		bugreport-0.5.0 \
		bumpalo-3.12.0 \
		bwrap-1.3.0 \
		bytesize-1.3.0 \
		cassowary-0.3.0 \
		cc-1.0.79 \
		cfg-if-1.0.0 \
		chrono-0.4.30 \
		clap-4.4.2 \
		clap_builder-4.4.2 \
		clap_lex-0.5.1 \
		codespan-reporting-0.11.1 \
		colorchoice-1.0.0 \
		core-foundation-sys-0.8.3 \
		crc32fast-1.3.2 \
		crossbeam-channel-0.5.8 \
		crossbeam-deque-0.8.2 \
		crossbeam-epoch-0.9.13 \
		crossbeam-utils-0.8.14 \
		crossterm-0.26.1 \
		crossterm_winapi-0.9.0 \
		cxx-1.0.90 \
		cxx-build-1.0.90 \
		cxxbridge-flags-1.0.90 \
		cxxbridge-macro-1.0.90 \
		dashmap-5.4.0 \
		diff-0.1.13 \
		dirs-5.0.1 \
		dirs-sys-0.4.1 \
		easy-cast-0.5.2 \
		either-1.8.1 \
		env_logger-0.10.0 \
		errno-0.2.8 \
		errno-dragonfly-0.1.2 \
		fancy-regex-0.11.0 \
		fastrand-1.9.0 \
		filetime-0.2.20 \
		flate2-1.0.25 \
		fnv-1.0.7 \
		form_urlencoded-1.2.0 \
		fsevent-sys-4.1.0 \
		futures-0.3.26 \
		futures-channel-0.3.26 \
		futures-core-0.3.26 \
		futures-executor-0.3.26 \
		futures-io-0.3.26 \
		futures-sink-0.3.26 \
		futures-task-0.3.26 \
		futures-util-0.3.26 \
		fuzzy-matcher-0.3.7 \
		getrandom-0.2.8 \
		gh-emoji-1.0.7 \
		gimli-0.27.3 \
		git-version-0.3.5 \
		git-version-macro-0.3.5 \
		git2-0.17.2 \
		hashbrown-0.12.3 \
		hermit-abi-0.3.2 \
		humantime-2.1.0 \
		iana-time-zone-0.1.53 \
		iana-time-zone-haiku-0.1.1 \
		idna-0.4.0 \
		indexmap-1.9.3 \
		inotify-0.9.6 \
		inotify-sys-0.1.5 \
		instant-0.1.12 \
		io-lifetimes-1.0.5 \
		is-terminal-0.4.3 \
		itertools-0.11.0 \
		itoa-1.0.8 \
		jobserver-0.1.25 \
		js-sys-0.3.61 \
		kqueue-1.0.7 \
		kqueue-sys-1.0.3 \
		lazy_static-1.4.0 \
		libc-0.2.139 \
		libgit2-sys-0.15.2+1.6.4 \
		libssh2-sys-0.3.0 \
		libz-sys-1.1.8 \
		link-cplusplus-1.0.8 \
		linux-raw-sys-0.1.4 \
		lock_api-0.4.10 \
		log-0.4.20 \
		memchr-2.5.0 \
		memoffset-0.7.1 \
		miniz_oxide-0.6.2 \
		mio-0.8.5 \
		notify-5.2.0 \
		notify-debouncer-mini-0.2.1 \
		num-traits-0.2.15 \
		num_cpus-1.16.0 \
		object-0.30.3 \
		once_cell-1.18.0 \
		onig-6.4.0 \
		onig_sys-69.8.1 \
		openssl-probe-0.1.5 \
		openssl-sys-0.9.93 \
		option-ext-0.2.0 \
		parking_lot-0.12.1 \
		parking_lot_core-0.9.7 \
		percent-encoding-2.3.0 \
		phf-0.11.1 \
		phf_shared-0.11.1 \
		pin-project-lite-0.2.9 \
		pin-utils-0.1.0 \
		pkg-config-0.3.26 \
		pretty_assertions-1.4.0 \
		proc-macro-error-1.0.4 \
		proc-macro-error-attr-1.0.4 \
		proc-macro-hack-0.5.20+deprecated \
		proc-macro2-1.0.63 \
		quote-1.0.29 \
		ratatui-0.21.0 \
		rayon-1.7.0 \
		rayon-core-1.11.0 \
		redox_syscall-0.2.16 \
		redox_users-0.4.3 \
		regex-1.9.1 \
		regex-automata-0.3.4 \
		regex-syntax-0.7.4 \
		ron-0.8.0 \
		rustc-demangle-0.1.21 \
		rustix-0.36.8 \
		ryu-1.0.14 \
		same-file-1.0.6 \
		scopeguard-1.2.0 \
		scratch-1.0.3 \
		serde-1.0.156 \
		serde_derive-1.0.156 \
		serde_json-1.0.93 \
		serial_test-1.0.0 \
		serial_test_derive-1.0.0 \
		shell-escape-0.1.5 \
		shellexpand-3.1.0 \
		signal-hook-0.3.15 \
		signal-hook-mio-0.2.3 \
		signal-hook-registry-1.4.1 \
		simplelog-0.12.1 \
		siphasher-0.3.10 \
		slab-0.4.8 \
		smallvec-1.11.0 \
		strsim-0.10.0 \
		struct-patch-0.2.3 \
		struct-patch-derive-0.2.3 \
		syn-1.0.107 \
		syntect-5.1.0 \
		sys-info-0.9.1 \
		tempfile-3.4.0 \
		termcolor-1.2.0 \
		thiserror-1.0.39 \
		thiserror-impl-1.0.39 \
		thread_local-1.1.7 \
		time-0.3.22 \
		time-core-0.1.1 \
		time-macros-0.2.9 \
		tinyvec-1.6.0 \
		tinyvec_macros-0.1.1 \
		unicode-bidi-0.3.10 \
		unicode-ident-1.0.6 \
		unicode-normalization-0.1.22 \
		unicode-segmentation-1.10.1 \
		unicode-truncate-0.2.0 \
		unicode-width-0.1.10 \
		url-2.4.1 \
		utf8parse-0.2.1 \
		vcpkg-0.2.15 \
		version_check-0.9.4 \
		walkdir-2.3.3 \
		wasi-0.11.0+wasi-snapshot-preview1 \
		wasm-bindgen-0.2.84 \
		wasm-bindgen-backend-0.2.84 \
		wasm-bindgen-macro-0.2.84 \
		wasm-bindgen-macro-support-0.2.84 \
		wasm-bindgen-shared-0.2.84 \
		which-4.4.0 \
		winapi-0.3.9 \
		winapi-i686-pc-windows-gnu-0.4.0 \
		winapi-util-0.1.5 \
		winapi-x86_64-pc-windows-gnu-0.4.0 \
		windows-sys-0.42.0 \
		windows-sys-0.45.0 \
		windows-sys-0.48.0 \
		windows-targets-0.42.1 \
		windows-targets-0.48.1 \
		windows_aarch64_gnullvm-0.42.1 \
		windows_aarch64_gnullvm-0.48.0 \
		windows_aarch64_msvc-0.42.1 \
		windows_aarch64_msvc-0.48.0 \
		windows_i686_gnu-0.42.1 \
		windows_i686_gnu-0.48.0 \
		windows_i686_msvc-0.42.1 \
		windows_i686_msvc-0.48.0 \
		windows_x86_64_gnu-0.42.1 \
		windows_x86_64_gnu-0.48.0 \
		windows_x86_64_gnullvm-0.42.1 \
		windows_x86_64_gnullvm-0.48.0 \
		windows_x86_64_msvc-0.42.1 \
		windows_x86_64_msvc-0.48.0 \
		yansi-0.5.1

Lines 1-4 Link Here

(-)b/devel/gitui/distinfo (-3 / +1 lines)
1	TIMESTAMP = 1694319114	1	TIMESTAMP = 1698870993
2	SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97	2	SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
3	SIZE (rust/crates/addr2line-0.19.0.crate) = 33210	3	SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
4	SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe	4	SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
Lines 227-234 SHA256 (rust/crates/onig_sys-69.8.1.crate) = 7b829e3d7e9cc74c7e315ee8edb185bf419 Link Here
227	SIZE (rust/crates/onig_sys-69.8.1.crate) = 638216	227	SIZE (rust/crates/onig_sys-69.8.1.crate) = 638216
228	SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf	228	SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
229	SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227	229	SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
230	SHA256 (rust/crates/openssl-src-300.1.3+3.1.2.crate) = cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107
231	SIZE (rust/crates/openssl-src-300.1.3+3.1.2.crate) = 8823710
232	SHA256 (rust/crates/openssl-sys-0.9.93.crate) = db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d	230	SHA256 (rust/crates/openssl-sys-0.9.93.crate) = db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d
233	SIZE (rust/crates/openssl-sys-0.9.93.crate) = 66922	231	SIZE (rust/crates/openssl-sys-0.9.93.crate) = 66922
234	SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d	232	SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d




Remove vendored openssl-src

--- Cargo.lock.orig	2023-11-01 20:34:52 UTC
+++ Cargo.lock
@@ -1147,15 +1147,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
-name = "openssl-src"
-version = "300.1.3+3.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107"
-dependencies = [
- "cc",
-]
-
-[[package]]
 name = "openssl-sys"
 version = "0.9.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1163,7 +1154,6 @@ dependencies = [
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]




Do not use vendored openssl

--- asyncgit/Cargo.toml.orig	2023-11-01 20:43:42 UTC
+++ asyncgit/Cargo.toml
@@ -21,7 +21,7 @@ log = "0.4"
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
 # pinning to vendored openssl, using the git2 feature this gets lost with new resolver
-openssl-sys = { version = '0.9', features = ["vendored"], optional = true }
+openssl-sys = { version = '0.9', optional = true }
 rayon = "1.7"
 rayon-core = "1.11"
 scopetime = { path = "../scopetime", version = "0.1" }

Return to bug 267469

Lines 1-7 Link Here

(-)b/devel/gitui/Makefile (-225 / +11 lines)
1	PORTNAME= gitui	1	PORTNAME= gitui
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.24.3	3	DISTVERSION= 0.24.3 # After update, `make patch` and `make cargo-crates > Makefile.crates` to avoid fetching vendored openssl-src
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= devel	5	CATEGORIES= devel
6		6
7	MAINTAINER= yuri@FreeBSD.org	7	MAINTAINER= yuri@FreeBSD.org
Lines 11-254 WWW= https://github.com/extrawurst/gitui Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE.md	12	LICENSE_FILE= ${WRKSRC}/LICENSE.md
13		13
14	BROKEN_armv7= error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
15	BROKEN_i386= error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
16	BROKEN_powerpc= error: conflicting types for 'get_proc_total', see https://github.com/FillZpp/sys-info-rs/issues/80
17
18	BUILD_DEPENDS= bash:shells/bash \	14	BUILD_DEPENDS= bash:shells/bash \
19	gmake:devel/gmake	15	gmake:devel/gmake
20	LIB_DEPENDS= libgit2.so:devel/libgit2 \	16	LIB_DEPENDS= libgit2.so:devel/libgit2 \
21	libssh2.so:security/libssh2	17	libssh2.so:security/libssh2
22		18
23	USES= cargo pkgconfig localbase:ldflags perl5 python:build xorg	19	USES= cargo localbase:ldflags perl5 pkgconfig python:build ssl xorg
24	USE_XORG= xcb	20	USE_XORG= xcb
25		21
26	USE_GITHUB= yes	22	USE_GITHUB= yes
27	GH_ACCOUNT= extrawurst	23	GH_ACCOUNT= extrawurst
28		24
29	CARGO_CRATES= addr2line-0.19.0 \
30	adler-1.0.2 \
31	aho-corasick-1.0.2 \
32	android-tzdata-0.1.1 \
33	android_system_properties-0.1.5 \
34	anstream-0.5.0 \
35	anstyle-1.0.2 \
36	anstyle-parse-0.2.1 \
37	anstyle-query-1.0.0 \
38	anstyle-wincon-2.1.0 \
39	anyhow-1.0.75 \
40	autocfg-1.1.0 \
41	backtrace-0.3.67 \
42	base64-0.13.1 \
43	bincode-1.3.3 \
44	bit-set-0.5.3 \
45	bit-vec-0.6.3 \
46	bitflags-1.3.2 \
47	bugreport-0.5.0 \
48	bumpalo-3.12.0 \
49	bwrap-1.3.0 \
50	bytesize-1.3.0 \
51	cassowary-0.3.0 \
52	cc-1.0.79 \
53	cfg-if-1.0.0 \
54	chrono-0.4.30 \
55	clap-4.4.2 \
56	clap_builder-4.4.2 \
57	clap_lex-0.5.1 \
58	codespan-reporting-0.11.1 \
59	colorchoice-1.0.0 \
60	core-foundation-sys-0.8.3 \
61	crc32fast-1.3.2 \
62	crossbeam-channel-0.5.8 \
63	crossbeam-deque-0.8.2 \
64	crossbeam-epoch-0.9.13 \
65	crossbeam-utils-0.8.14 \
66	crossterm-0.26.1 \
67	crossterm_winapi-0.9.0 \
68	cxx-1.0.90 \
69	cxx-build-1.0.90 \
70	cxxbridge-flags-1.0.90 \
71	cxxbridge-macro-1.0.90 \
72	dashmap-5.4.0 \
73	diff-0.1.13 \
74	dirs-5.0.1 \
75	dirs-sys-0.4.1 \
76	easy-cast-0.5.2 \
77	either-1.8.1 \
78	env_logger-0.10.0 \
79	errno-0.2.8 \
80	errno-dragonfly-0.1.2 \
81	fancy-regex-0.11.0 \
82	fastrand-1.9.0 \
83	filetime-0.2.20 \
84	flate2-1.0.25 \
85	fnv-1.0.7 \
86	form_urlencoded-1.2.0 \
87	fsevent-sys-4.1.0 \
88	futures-0.3.26 \
89	futures-channel-0.3.26 \
90	futures-core-0.3.26 \
91	futures-executor-0.3.26 \
92	futures-io-0.3.26 \
93	futures-sink-0.3.26 \
94	futures-task-0.3.26 \
95	futures-util-0.3.26 \
96	fuzzy-matcher-0.3.7 \
97	getrandom-0.2.8 \
98	gh-emoji-1.0.7 \
99	gimli-0.27.3 \
100	git-version-0.3.5 \
101	git-version-macro-0.3.5 \
102	git2-0.17.2 \
103	hashbrown-0.12.3 \
104	hermit-abi-0.3.2 \
105	humantime-2.1.0 \
106	iana-time-zone-0.1.53 \
107	iana-time-zone-haiku-0.1.1 \
108	idna-0.4.0 \
109	indexmap-1.9.3 \
110	inotify-0.9.6 \
111	inotify-sys-0.1.5 \
112	instant-0.1.12 \
113	io-lifetimes-1.0.5 \
114	is-terminal-0.4.3 \
115	itertools-0.11.0 \
116	itoa-1.0.8 \
117	jobserver-0.1.25 \
118	js-sys-0.3.61 \
119	kqueue-1.0.7 \
120	kqueue-sys-1.0.3 \
121	lazy_static-1.4.0 \
122	libc-0.2.139 \
123	libgit2-sys-0.15.2+1.6.4 \
124	libssh2-sys-0.3.0 \
125	libz-sys-1.1.8 \
126	link-cplusplus-1.0.8 \
127	linux-raw-sys-0.1.4 \
128	lock_api-0.4.10 \
129	log-0.4.20 \
130	memchr-2.5.0 \
131	memoffset-0.7.1 \
132	miniz_oxide-0.6.2 \
133	mio-0.8.5 \
134	notify-5.2.0 \
135	notify-debouncer-mini-0.2.1 \
136	num-traits-0.2.15 \
137	num_cpus-1.16.0 \
138	object-0.30.3 \
139	once_cell-1.18.0 \
140	onig-6.4.0 \
141	onig_sys-69.8.1 \
142	openssl-probe-0.1.5 \
143	openssl-src-300.1.3+3.1.2 \
144	openssl-sys-0.9.93 \
145	option-ext-0.2.0 \
146	parking_lot-0.12.1 \
147	parking_lot_core-0.9.7 \
148	percent-encoding-2.3.0 \
149	phf-0.11.1 \
150	phf_shared-0.11.1 \
151	pin-project-lite-0.2.9 \
152	pin-utils-0.1.0 \
153	pkg-config-0.3.26 \
154	pretty_assertions-1.4.0 \
155	proc-macro-error-1.0.4 \
156	proc-macro-error-attr-1.0.4 \
157	proc-macro-hack-0.5.20+deprecated \
158	proc-macro2-1.0.63 \
159	quote-1.0.29 \
160	ratatui-0.21.0 \
161	rayon-1.7.0 \
162	rayon-core-1.11.0 \
163	redox_syscall-0.2.16 \
164	redox_users-0.4.3 \
165	regex-1.9.1 \
166	regex-automata-0.3.4 \
167	regex-syntax-0.7.4 \
168	ron-0.8.0 \
169	rustc-demangle-0.1.21 \
170	rustix-0.36.8 \
171	ryu-1.0.14 \
172	same-file-1.0.6 \
173	scopeguard-1.2.0 \
174	scratch-1.0.3 \
175	serde-1.0.156 \
176	serde_derive-1.0.156 \
177	serde_json-1.0.93 \
178	serial_test-1.0.0 \
179	serial_test_derive-1.0.0 \
180	shell-escape-0.1.5 \
181	shellexpand-3.1.0 \
182	signal-hook-0.3.15 \
183	signal-hook-mio-0.2.3 \
184	signal-hook-registry-1.4.1 \
185	simplelog-0.12.1 \
186	siphasher-0.3.10 \
187	slab-0.4.8 \
188	smallvec-1.11.0 \
189	strsim-0.10.0 \
190	struct-patch-0.2.3 \
191	struct-patch-derive-0.2.3 \
192	syn-1.0.107 \
193	syntect-5.1.0 \
194	sys-info-0.9.1 \
195	tempfile-3.4.0 \
196	termcolor-1.2.0 \
197	thiserror-1.0.39 \
198	thiserror-impl-1.0.39 \
199	thread_local-1.1.7 \
200	time-0.3.22 \
201	time-core-0.1.1 \
202	time-macros-0.2.9 \
203	tinyvec-1.6.0 \
204	tinyvec_macros-0.1.1 \
205	unicode-bidi-0.3.10 \
206	unicode-ident-1.0.6 \
207	unicode-normalization-0.1.22 \
208	unicode-segmentation-1.10.1 \
209	unicode-truncate-0.2.0 \
210	unicode-width-0.1.10 \
211	url-2.4.1 \
212	utf8parse-0.2.1 \
213	vcpkg-0.2.15 \
214	version_check-0.9.4 \
215	walkdir-2.3.3 \
216	wasi-0.11.0+wasi-snapshot-preview1 \
217	wasm-bindgen-0.2.84 \
218	wasm-bindgen-backend-0.2.84 \
219	wasm-bindgen-macro-0.2.84 \
220	wasm-bindgen-macro-support-0.2.84 \
221	wasm-bindgen-shared-0.2.84 \
222	which-4.4.0 \
223	winapi-0.3.9 \
224	winapi-i686-pc-windows-gnu-0.4.0 \
225	winapi-util-0.1.5 \
226	winapi-x86_64-pc-windows-gnu-0.4.0 \
227	windows-sys-0.42.0 \
228	windows-sys-0.45.0 \
229	windows-sys-0.48.0 \
230	windows-targets-0.42.1 \
231	windows-targets-0.48.1 \
232	windows_aarch64_gnullvm-0.42.1 \
233	windows_aarch64_gnullvm-0.48.0 \
234	windows_aarch64_msvc-0.42.1 \
235	windows_aarch64_msvc-0.48.0 \
236	windows_i686_gnu-0.42.1 \
237	windows_i686_gnu-0.48.0 \
238	windows_i686_msvc-0.42.1 \
239	windows_i686_msvc-0.48.0 \
240	windows_x86_64_gnu-0.42.1 \
241	windows_x86_64_gnu-0.48.0 \
242	windows_x86_64_gnullvm-0.42.1 \
243	windows_x86_64_gnullvm-0.48.0 \
244	windows_x86_64_msvc-0.42.1 \
245	windows_x86_64_msvc-0.48.0 \
246	yansi-0.5.1
247	RUSTFLAGS+= --cap-lints=warn	25	RUSTFLAGS+= --cap-lints=warn
248	PLIST_FILES= bin/${PORTNAME}	26	PLIST_FILES= bin/${PORTNAME}
249		27
250	BINARY_ALIAS= python3=${PYTHON_CMD} # xcb requires python3	28	BINARY_ALIAS= python3=${PYTHON_CMD} # xcb requires python3
251		29
		30	# Fix build on armv7, i386 and powerpc
		31	# sys-info-0.9.1 crate issue: https://github.com/FillZpp/sys-info-rs/issues/80
		32	post-patch:
		33	@${REINPLACE_CMD} \
		34	-e '/get_cpu/s\|unsigned long\|uint64_t\|' \
		35	-e '/get_proc_total/s\|unsigned long\|uint64_t\|' \
		36	${WRKSRC}/cargo-crates/sys-info-0.9.1/c/*.[ch]
		37
252	post-install:	38	post-install:
253	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	39	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
254		40

Added Link Here

(-)b/devel/gitui/Makefile.crates (+217 lines)
1	CARGO_CRATES= addr2line-0.19.0 \
2	adler-1.0.2 \
3	aho-corasick-1.0.2 \
4	android-tzdata-0.1.1 \
5	android_system_properties-0.1.5 \
6	anstream-0.5.0 \
7	anstyle-1.0.2 \
8	anstyle-parse-0.2.1 \
9	anstyle-query-1.0.0 \
10	anstyle-wincon-2.1.0 \
11	anyhow-1.0.75 \
12	autocfg-1.1.0 \
13	backtrace-0.3.67 \
14	base64-0.13.1 \
15	bincode-1.3.3 \
16	bit-set-0.5.3 \
17	bit-vec-0.6.3 \
18	bitflags-1.3.2 \
19	bugreport-0.5.0 \
20	bumpalo-3.12.0 \
21	bwrap-1.3.0 \
22	bytesize-1.3.0 \
23	cassowary-0.3.0 \
24	cc-1.0.79 \
25	cfg-if-1.0.0 \
26	chrono-0.4.30 \
27	clap-4.4.2 \
28	clap_builder-4.4.2 \
29	clap_lex-0.5.1 \
30	codespan-reporting-0.11.1 \
31	colorchoice-1.0.0 \
32	core-foundation-sys-0.8.3 \
33	crc32fast-1.3.2 \
34	crossbeam-channel-0.5.8 \
35	crossbeam-deque-0.8.2 \
36	crossbeam-epoch-0.9.13 \
37	crossbeam-utils-0.8.14 \
38	crossterm-0.26.1 \
39	crossterm_winapi-0.9.0 \
40	cxx-1.0.90 \
41	cxx-build-1.0.90 \
42	cxxbridge-flags-1.0.90 \
43	cxxbridge-macro-1.0.90 \
44	dashmap-5.4.0 \
45	diff-0.1.13 \
46	dirs-5.0.1 \
47	dirs-sys-0.4.1 \
48	easy-cast-0.5.2 \
49	either-1.8.1 \
50	env_logger-0.10.0 \
51	errno-0.2.8 \
52	errno-dragonfly-0.1.2 \
53	fancy-regex-0.11.0 \
54	fastrand-1.9.0 \
55	filetime-0.2.20 \
56	flate2-1.0.25 \
57	fnv-1.0.7 \
58	form_urlencoded-1.2.0 \
59	fsevent-sys-4.1.0 \
60	futures-0.3.26 \
61	futures-channel-0.3.26 \
62	futures-core-0.3.26 \
63	futures-executor-0.3.26 \
64	futures-io-0.3.26 \
65	futures-sink-0.3.26 \
66	futures-task-0.3.26 \
67	futures-util-0.3.26 \
68	fuzzy-matcher-0.3.7 \
69	getrandom-0.2.8 \
70	gh-emoji-1.0.7 \
71	gimli-0.27.3 \
72	git-version-0.3.5 \
73	git-version-macro-0.3.5 \
74	git2-0.17.2 \
75	hashbrown-0.12.3 \
76	hermit-abi-0.3.2 \
77	humantime-2.1.0 \
78	iana-time-zone-0.1.53 \
79	iana-time-zone-haiku-0.1.1 \
80	idna-0.4.0 \
81	indexmap-1.9.3 \
82	inotify-0.9.6 \
83	inotify-sys-0.1.5 \
84	instant-0.1.12 \
85	io-lifetimes-1.0.5 \
86	is-terminal-0.4.3 \
87	itertools-0.11.0 \
88	itoa-1.0.8 \
89	jobserver-0.1.25 \
90	js-sys-0.3.61 \
91	kqueue-1.0.7 \
92	kqueue-sys-1.0.3 \
93	lazy_static-1.4.0 \
94	libc-0.2.139 \
95	libgit2-sys-0.15.2+1.6.4 \
96	libssh2-sys-0.3.0 \
97	libz-sys-1.1.8 \
98	link-cplusplus-1.0.8 \
99	linux-raw-sys-0.1.4 \
100	lock_api-0.4.10 \
101	log-0.4.20 \
102	memchr-2.5.0 \
103	memoffset-0.7.1 \
104	miniz_oxide-0.6.2 \
105	mio-0.8.5 \
106	notify-5.2.0 \
107	notify-debouncer-mini-0.2.1 \
108	num-traits-0.2.15 \
109	num_cpus-1.16.0 \
110	object-0.30.3 \
111	once_cell-1.18.0 \
112	onig-6.4.0 \
113	onig_sys-69.8.1 \
114	openssl-probe-0.1.5 \
115	openssl-sys-0.9.93 \
116	option-ext-0.2.0 \
117	parking_lot-0.12.1 \
118	parking_lot_core-0.9.7 \
119	percent-encoding-2.3.0 \
120	phf-0.11.1 \
121	phf_shared-0.11.1 \
122	pin-project-lite-0.2.9 \
123	pin-utils-0.1.0 \
124	pkg-config-0.3.26 \
125	pretty_assertions-1.4.0 \
126	proc-macro-error-1.0.4 \
127	proc-macro-error-attr-1.0.4 \
128	proc-macro-hack-0.5.20+deprecated \
129	proc-macro2-1.0.63 \
130	quote-1.0.29 \
131	ratatui-0.21.0 \
132	rayon-1.7.0 \
133	rayon-core-1.11.0 \
134	redox_syscall-0.2.16 \
135	redox_users-0.4.3 \
136	regex-1.9.1 \
137	regex-automata-0.3.4 \
138	regex-syntax-0.7.4 \
139	ron-0.8.0 \
140	rustc-demangle-0.1.21 \
141	rustix-0.36.8 \
142	ryu-1.0.14 \
143	same-file-1.0.6 \
144	scopeguard-1.2.0 \
145	scratch-1.0.3 \
146	serde-1.0.156 \
147	serde_derive-1.0.156 \
148	serde_json-1.0.93 \
149	serial_test-1.0.0 \
150	serial_test_derive-1.0.0 \
151	shell-escape-0.1.5 \
152	shellexpand-3.1.0 \
153	signal-hook-0.3.15 \
154	signal-hook-mio-0.2.3 \
155	signal-hook-registry-1.4.1 \
156	simplelog-0.12.1 \
157	siphasher-0.3.10 \
158	slab-0.4.8 \
159	smallvec-1.11.0 \
160	strsim-0.10.0 \
161	struct-patch-0.2.3 \
162	struct-patch-derive-0.2.3 \
163	syn-1.0.107 \
164	syntect-5.1.0 \
165	sys-info-0.9.1 \
166	tempfile-3.4.0 \
167	termcolor-1.2.0 \
168	thiserror-1.0.39 \
169	thiserror-impl-1.0.39 \
170	thread_local-1.1.7 \
171	time-0.3.22 \
172	time-core-0.1.1 \
173	time-macros-0.2.9 \
174	tinyvec-1.6.0 \
175	tinyvec_macros-0.1.1 \
176	unicode-bidi-0.3.10 \
177	unicode-ident-1.0.6 \
178	unicode-normalization-0.1.22 \
179	unicode-segmentation-1.10.1 \
180	unicode-truncate-0.2.0 \
181	unicode-width-0.1.10 \
182	url-2.4.1 \
183	utf8parse-0.2.1 \
184	vcpkg-0.2.15 \
185	version_check-0.9.4 \
186	walkdir-2.3.3 \
187	wasi-0.11.0+wasi-snapshot-preview1 \
188	wasm-bindgen-0.2.84 \
189	wasm-bindgen-backend-0.2.84 \
190	wasm-bindgen-macro-0.2.84 \
191	wasm-bindgen-macro-support-0.2.84 \
192	wasm-bindgen-shared-0.2.84 \
193	which-4.4.0 \
194	winapi-0.3.9 \
195	winapi-i686-pc-windows-gnu-0.4.0 \
196	winapi-util-0.1.5 \
197	winapi-x86_64-pc-windows-gnu-0.4.0 \
198	windows-sys-0.42.0 \
199	windows-sys-0.45.0 \
200	windows-sys-0.48.0 \
201	windows-targets-0.42.1 \
202	windows-targets-0.48.1 \
203	windows_aarch64_gnullvm-0.42.1 \
204	windows_aarch64_gnullvm-0.48.0 \
205	windows_aarch64_msvc-0.42.1 \
206	windows_aarch64_msvc-0.48.0 \
207	windows_i686_gnu-0.42.1 \
208	windows_i686_gnu-0.48.0 \
209	windows_i686_msvc-0.42.1 \
210	windows_i686_msvc-0.48.0 \
211	windows_x86_64_gnu-0.42.1 \
212	windows_x86_64_gnu-0.48.0 \
213	windows_x86_64_gnullvm-0.42.1 \
214	windows_x86_64_gnullvm-0.48.0 \
215	windows_x86_64_msvc-0.42.1 \
216	windows_x86_64_msvc-0.48.0 \
217	yansi-0.5.1

Added Link Here

(-)b/devel/gitui/files/patch-Cargo.lock (+28 lines)
1	Remove vendored openssl-src
2
3	--- Cargo.lock.orig 2023-11-01 20:34:52 UTC
4	+++ Cargo.lock
5	@@ -1147,15 +1147,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178
6	checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
7
8	[[package]]
9	-name = "openssl-src"
10	-version = "300.1.3+3.1.2"
11	-source = "registry+https://github.com/rust-lang/crates.io-index"
12	-checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107"
13	-dependencies = [
14	- "cc",
15	-]
16	-
17	-[[package]]
18	name = "openssl-sys"
19	version = "0.9.93"
20	source = "registry+https://github.com/rust-lang/crates.io-index"
21	@@ -1163,7 +1154,6 @@ dependencies = [
22	dependencies = [
23	"cc",
24	"libc",
25	- "openssl-src",
26	"pkg-config",
27	"vcpkg",
28	]

Added Link Here

(-)b/devel/gitui/files/patch-asyncgit_Cargo.toml (+13 lines)
1	Do not use vendored openssl
2
3	--- asyncgit/Cargo.toml.orig 2023-11-01 20:43:42 UTC
4	+++ asyncgit/Cargo.toml
5	@@ -21,7 +21,7 @@ log = "0.4"
6	# git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
7	# git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
8	# pinning to vendored openssl, using the git2 feature this gets lost with new resolver
9	-openssl-sys = { version = '0.9', features = ["vendored"], optional = true }
10	+openssl-sys = { version = '0.9', optional = true }
11	rayon = "1.7"
12	rayon-core = "1.11"
13	scopetime = { path = "../scopetime", version = "0.1" }