View | Details | Raw Unified | Return to bug 267469 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/gitui/Makefile (-203 / +10 lines)
Lines 1-7 Link Here
1
PORTNAME=	gitui
1
PORTNAME=	gitui
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	0.21.0
3
DISTVERSION=	0.21.0 # remove openssl-src-* from CARGO-CRATES each update
4
PORTREVISION=	2
4
PORTREVISION=	3
5
CATEGORIES=	devel
5
CATEGORIES=	devel
6
6
7
MAINTAINER=	yuri@FreeBSD.org
7
MAINTAINER=	yuri@FreeBSD.org
Lines 11-232 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 pkgconfig localbase:ldflags perl5 python:build xorg ssl
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.17.0 \
30
		adler-1.0.2 \
31
		ahash-0.7.6 \
32
		aho-corasick-0.7.18 \
33
		android_system_properties-0.1.4 \
34
		ansi_term-0.12.1 \
35
		anyhow-1.0.62 \
36
		arrayvec-0.4.12 \
37
		atty-0.2.14 \
38
		autocfg-1.1.0 \
39
		backtrace-0.3.66 \
40
		base64-0.13.0 \
41
		bincode-1.3.3 \
42
		bit-set-0.5.3 \
43
		bit-vec-0.6.3 \
44
		bitflags-1.3.2 \
45
		bugreport-0.5.0 \
46
		bumpalo-3.11.0 \
47
		bytemuck-1.12.1 \
48
		bytesize-1.1.0 \
49
		cassowary-0.3.0 \
50
		cc-1.0.73 \
51
		cfg-if-1.0.0 \
52
		chrono-0.4.22 \
53
		clap-3.2.17 \
54
		clap_lex-0.2.4 \
55
		core-foundation-sys-0.8.3 \
56
		cpp_demangle-0.3.5 \
57
		crc32fast-1.3.2 \
58
		crossbeam-channel-0.5.6 \
59
		crossbeam-deque-0.8.2 \
60
		crossbeam-epoch-0.9.10 \
61
		crossbeam-utils-0.8.11 \
62
		crossterm-0.23.2 \
63
		crossterm_winapi-0.9.0 \
64
		ctor-0.1.23 \
65
		dashmap-5.3.4 \
66
		debugid-0.8.0 \
67
		diff-0.1.13 \
68
		dirs-4.0.0 \
69
		dirs-next-2.0.0 \
70
		dirs-sys-0.3.7 \
71
		dirs-sys-next-0.1.2 \
72
		easy-cast-0.4.4 \
73
		either-1.7.0 \
74
		fancy-regex-0.7.1 \
75
		fastrand-1.8.0 \
76
		findshlibs-0.10.2 \
77
		flate2-1.0.24 \
78
		fnv-1.0.7 \
79
		form_urlencoded-1.0.1 \
80
		futures-0.3.23 \
81
		futures-channel-0.3.23 \
82
		futures-core-0.3.23 \
83
		futures-executor-0.3.23 \
84
		futures-io-0.3.23 \
85
		futures-sink-0.3.23 \
86
		futures-task-0.3.23 \
87
		futures-util-0.3.23 \
88
		fuzzy-matcher-0.3.7 \
89
		getrandom-0.2.7 \
90
		gh-emoji-1.0.7 \
91
		gimli-0.26.2 \
92
		git-version-0.3.5 \
93
		git-version-macro-0.3.5 \
94
		git2-0.15.0 \
95
		hashbrown-0.12.3 \
96
		hermit-abi-0.1.19 \
97
		iana-time-zone-0.1.45 \
98
		idna-0.2.3 \
99
		indexmap-1.9.1 \
100
		inferno-0.11.7 \
101
		instant-0.1.12 \
102
		itertools-0.10.3 \
103
		itoa-0.4.8 \
104
		itoa-1.0.3 \
105
		jobserver-0.1.24 \
106
		js-sys-0.3.59 \
107
		lazy_static-1.4.0 \
108
		libc-0.2.132 \
109
		libgit2-sys-0.14.0+1.5.0 \
110
		libssh2-sys-0.2.23 \
111
		libz-sys-1.1.8 \
112
		lock_api-0.4.7 \
113
		log-0.4.17 \
114
		matches-0.1.9 \
115
		memchr-2.5.0 \
116
		memmap2-0.5.7 \
117
		memoffset-0.6.5 \
118
		miniz_oxide-0.5.3 \
119
		mio-0.8.4 \
120
		nix-0.24.2 \
121
		nodrop-0.1.14 \
122
		num-format-0.4.0 \
123
		num-integer-0.1.45 \
124
		num-traits-0.2.15 \
125
		num_cpus-1.13.1 \
126
		num_threads-0.1.6 \
127
		object-0.29.0 \
128
		once_cell-1.13.1 \
129
		openssl-probe-0.1.5 \
130
		openssl-src-111.22.0+1.1.1q \
131
		openssl-sys-0.9.75 \
132
		os_str_bytes-6.3.0 \
133
		output_vt100-0.1.3 \
134
		parking_lot-0.12.1 \
135
		parking_lot_core-0.9.3 \
136
		percent-encoding-2.1.0 \
137
		phf-0.11.1 \
138
		phf_shared-0.11.1 \
139
		pin-project-lite-0.2.9 \
140
		pin-utils-0.1.0 \
141
		pkg-config-0.3.25 \
142
		pprof-0.10.0 \
143
		pretty_assertions-1.2.1 \
144
		proc-macro-error-1.0.4 \
145
		proc-macro-error-attr-1.0.4 \
146
		proc-macro-hack-0.5.19 \
147
		proc-macro2-1.0.43 \
148
		quick-xml-0.23.0 \
149
		quote-1.0.21 \
150
		rayon-core-1.9.3 \
151
		redox_syscall-0.2.16 \
152
		redox_users-0.4.3 \
153
		regex-1.6.0 \
154
		regex-syntax-0.6.27 \
155
		remove_dir_all-0.5.3 \
156
		rgb-0.8.33 \
157
		ron-0.8.0 \
158
		rustc-demangle-0.1.21 \
159
		ryu-1.0.11 \
160
		same-file-1.0.6 \
161
		scopeguard-1.1.0 \
162
		serde-1.0.143 \
163
		serde_derive-1.0.143 \
164
		serde_json-1.0.83 \
165
		serial_test-0.9.0 \
166
		serial_test_derive-0.9.0 \
167
		shell-escape-0.1.5 \
168
		shellexpand-2.1.2 \
169
		signal-hook-0.3.14 \
170
		signal-hook-mio-0.2.3 \
171
		signal-hook-registry-1.4.0 \
172
		simplelog-0.12.0 \
173
		siphasher-0.3.10 \
174
		slab-0.4.7 \
175
		smallvec-1.9.0 \
176
		smawk-0.3.1 \
177
		stable_deref_trait-1.2.0 \
178
		str_stack-0.1.0 \
179
		strsim-0.10.0 \
180
		symbolic-common-9.1.1 \
181
		symbolic-demangle-9.1.1 \
182
		syn-1.0.99 \
183
		syntect-5.0.0 \
184
		sys-info-0.9.1 \
185
		tempfile-3.3.0 \
186
		termcolor-1.1.3 \
187
		textwrap-0.15.0 \
188
		thiserror-1.0.32 \
189
		thiserror-impl-1.0.32 \
190
		thread_local-1.1.4 \
191
		time-0.3.13 \
192
		time-macros-0.2.4 \
193
		tinyvec-1.6.0 \
194
		tinyvec_macros-0.1.0 \
195
		tui-0.18.0 \
196
		unicode-bidi-0.3.8 \
197
		unicode-ident-1.0.3 \
198
		unicode-linebreak-0.1.2 \
199
		unicode-normalization-0.1.21 \
200
		unicode-segmentation-1.9.0 \
201
		unicode-truncate-0.2.0 \
202
		unicode-width-0.1.9 \
203
		url-2.2.2 \
204
		uuid-1.1.2 \
205
		vcpkg-0.2.15 \
206
		version_check-0.9.4 \
207
		walkdir-2.3.2 \
208
		wasi-0.11.0+wasi-snapshot-preview1 \
209
		wasm-bindgen-0.2.82 \
210
		wasm-bindgen-backend-0.2.82 \
211
		wasm-bindgen-macro-0.2.82 \
212
		wasm-bindgen-macro-support-0.2.82 \
213
		wasm-bindgen-shared-0.2.82 \
214
		which-4.2.5 \
215
		winapi-0.3.9 \
216
		winapi-i686-pc-windows-gnu-0.4.0 \
217
		winapi-util-0.1.5 \
218
		winapi-x86_64-pc-windows-gnu-0.4.0 \
219
		windows-sys-0.36.1 \
220
		windows_aarch64_msvc-0.36.1 \
221
		windows_i686_gnu-0.36.1 \
222
		windows_i686_msvc-0.36.1 \
223
		windows_x86_64_gnu-0.36.1 \
224
		windows_x86_64_msvc-0.36.1
225
RUSTFLAGS+=	--cap-lints=warn
25
RUSTFLAGS+=	--cap-lints=warn
226
PLIST_FILES=	bin/${PORTNAME}
26
PLIST_FILES=	bin/${PORTNAME}
227
27
228
BINARY_ALIAS=	python3=${PYTHON_CMD} # xcb requires python3
28
BINARY_ALIAS=	python3=${PYTHON_CMD} # xcb requires python3
229
29
30
# sys-info-0.9.1 crate fix: https://github.com/FillZpp/sys-info-rs/issues/80
31
post-patch:
32
	@${REINPLACE_CMD} \
33
	-e '/get_cpu/s|unsigned long|uint64_t|' \
34
	-e '/get_proc_total/s|unsigned long|uint64_t|' \
35
	${WRKSRC}/cargo-crates/sys-info-0.9.1/c/*.[ch]
36
230
post-install:
37
post-install:
231
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
38
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
232
39
(-)b/devel/gitui/Makefile.crates (+195 lines)
Added Link Here
1
CARGO_CRATES=	addr2line-0.17.0 \
2
		adler-1.0.2 \
3
		ahash-0.7.6 \
4
		aho-corasick-0.7.18 \
5
		android_system_properties-0.1.4 \
6
		ansi_term-0.12.1 \
7
		anyhow-1.0.62 \
8
		arrayvec-0.4.12 \
9
		atty-0.2.14 \
10
		autocfg-1.1.0 \
11
		backtrace-0.3.66 \
12
		base64-0.13.0 \
13
		bincode-1.3.3 \
14
		bit-set-0.5.3 \
15
		bit-vec-0.6.3 \
16
		bitflags-1.3.2 \
17
		bugreport-0.5.0 \
18
		bumpalo-3.11.0 \
19
		bytemuck-1.12.1 \
20
		bytesize-1.1.0 \
21
		cassowary-0.3.0 \
22
		cc-1.0.73 \
23
		cfg-if-1.0.0 \
24
		chrono-0.4.22 \
25
		clap-3.2.17 \
26
		clap_lex-0.2.4 \
27
		core-foundation-sys-0.8.3 \
28
		cpp_demangle-0.3.5 \
29
		crc32fast-1.3.2 \
30
		crossbeam-channel-0.5.6 \
31
		crossbeam-deque-0.8.2 \
32
		crossbeam-epoch-0.9.10 \
33
		crossbeam-utils-0.8.11 \
34
		crossterm-0.23.2 \
35
		crossterm_winapi-0.9.0 \
36
		ctor-0.1.23 \
37
		dashmap-5.3.4 \
38
		debugid-0.8.0 \
39
		diff-0.1.13 \
40
		dirs-4.0.0 \
41
		dirs-next-2.0.0 \
42
		dirs-sys-0.3.7 \
43
		dirs-sys-next-0.1.2 \
44
		easy-cast-0.4.4 \
45
		either-1.7.0 \
46
		fancy-regex-0.7.1 \
47
		fastrand-1.8.0 \
48
		findshlibs-0.10.2 \
49
		flate2-1.0.24 \
50
		fnv-1.0.7 \
51
		form_urlencoded-1.0.1 \
52
		futures-0.3.23 \
53
		futures-channel-0.3.23 \
54
		futures-core-0.3.23 \
55
		futures-executor-0.3.23 \
56
		futures-io-0.3.23 \
57
		futures-sink-0.3.23 \
58
		futures-task-0.3.23 \
59
		futures-util-0.3.23 \
60
		fuzzy-matcher-0.3.7 \
61
		getrandom-0.2.7 \
62
		gh-emoji-1.0.7 \
63
		gimli-0.26.2 \
64
		git-version-0.3.5 \
65
		git-version-macro-0.3.5 \
66
		git2-0.15.0 \
67
		hashbrown-0.12.3 \
68
		hermit-abi-0.1.19 \
69
		iana-time-zone-0.1.45 \
70
		idna-0.2.3 \
71
		indexmap-1.9.1 \
72
		inferno-0.11.7 \
73
		instant-0.1.12 \
74
		itertools-0.10.3 \
75
		itoa-0.4.8 \
76
		itoa-1.0.3 \
77
		jobserver-0.1.24 \
78
		js-sys-0.3.59 \
79
		lazy_static-1.4.0 \
80
		libc-0.2.132 \
81
		libgit2-sys-0.14.0+1.5.0 \
82
		libssh2-sys-0.2.23 \
83
		libz-sys-1.1.8 \
84
		lock_api-0.4.7 \
85
		log-0.4.17 \
86
		matches-0.1.9 \
87
		memchr-2.5.0 \
88
		memmap2-0.5.7 \
89
		memoffset-0.6.5 \
90
		miniz_oxide-0.5.3 \
91
		mio-0.8.4 \
92
		nix-0.24.2 \
93
		nodrop-0.1.14 \
94
		num-format-0.4.0 \
95
		num-integer-0.1.45 \
96
		num-traits-0.2.15 \
97
		num_cpus-1.13.1 \
98
		num_threads-0.1.6 \
99
		object-0.29.0 \
100
		once_cell-1.13.1 \
101
		openssl-probe-0.1.5 \
102
		openssl-sys-0.9.75 \
103
		os_str_bytes-6.3.0 \
104
		output_vt100-0.1.3 \
105
		parking_lot-0.12.1 \
106
		parking_lot_core-0.9.3 \
107
		percent-encoding-2.1.0 \
108
		phf-0.11.1 \
109
		phf_shared-0.11.1 \
110
		pin-project-lite-0.2.9 \
111
		pin-utils-0.1.0 \
112
		pkg-config-0.3.25 \
113
		pprof-0.10.0 \
114
		pretty_assertions-1.2.1 \
115
		proc-macro-error-1.0.4 \
116
		proc-macro-error-attr-1.0.4 \
117
		proc-macro-hack-0.5.19 \
118
		proc-macro2-1.0.43 \
119
		quick-xml-0.23.0 \
120
		quote-1.0.21 \
121
		rayon-core-1.9.3 \
122
		redox_syscall-0.2.16 \
123
		redox_users-0.4.3 \
124
		regex-1.6.0 \
125
		regex-syntax-0.6.27 \
126
		remove_dir_all-0.5.3 \
127
		rgb-0.8.33 \
128
		ron-0.8.0 \
129
		rustc-demangle-0.1.21 \
130
		ryu-1.0.11 \
131
		same-file-1.0.6 \
132
		scopeguard-1.1.0 \
133
		serde-1.0.143 \
134
		serde_derive-1.0.143 \
135
		serde_json-1.0.83 \
136
		serial_test-0.9.0 \
137
		serial_test_derive-0.9.0 \
138
		shell-escape-0.1.5 \
139
		shellexpand-2.1.2 \
140
		signal-hook-0.3.14 \
141
		signal-hook-mio-0.2.3 \
142
		signal-hook-registry-1.4.0 \
143
		simplelog-0.12.0 \
144
		siphasher-0.3.10 \
145
		slab-0.4.7 \
146
		smallvec-1.9.0 \
147
		smawk-0.3.1 \
148
		stable_deref_trait-1.2.0 \
149
		str_stack-0.1.0 \
150
		strsim-0.10.0 \
151
		symbolic-common-9.1.1 \
152
		symbolic-demangle-9.1.1 \
153
		syn-1.0.99 \
154
		syntect-5.0.0 \
155
		sys-info-0.9.1 \
156
		tempfile-3.3.0 \
157
		termcolor-1.1.3 \
158
		textwrap-0.15.0 \
159
		thiserror-1.0.32 \
160
		thiserror-impl-1.0.32 \
161
		thread_local-1.1.4 \
162
		time-0.3.13 \
163
		time-macros-0.2.4 \
164
		tinyvec-1.6.0 \
165
		tinyvec_macros-0.1.0 \
166
		tui-0.18.0 \
167
		unicode-bidi-0.3.8 \
168
		unicode-ident-1.0.3 \
169
		unicode-linebreak-0.1.2 \
170
		unicode-normalization-0.1.21 \
171
		unicode-segmentation-1.9.0 \
172
		unicode-truncate-0.2.0 \
173
		unicode-width-0.1.9 \
174
		url-2.2.2 \
175
		uuid-1.1.2 \
176
		vcpkg-0.2.15 \
177
		version_check-0.9.4 \
178
		walkdir-2.3.2 \
179
		wasi-0.11.0+wasi-snapshot-preview1 \
180
		wasm-bindgen-0.2.82 \
181
		wasm-bindgen-backend-0.2.82 \
182
		wasm-bindgen-macro-0.2.82 \
183
		wasm-bindgen-macro-support-0.2.82 \
184
		wasm-bindgen-shared-0.2.82 \
185
		which-4.2.5 \
186
		winapi-0.3.9 \
187
		winapi-i686-pc-windows-gnu-0.4.0 \
188
		winapi-util-0.1.5 \
189
		winapi-x86_64-pc-windows-gnu-0.4.0 \
190
		windows-sys-0.36.1 \
191
		windows_aarch64_msvc-0.36.1 \
192
		windows_i686_gnu-0.36.1 \
193
		windows_i686_msvc-0.36.1 \
194
		windows_x86_64_gnu-0.36.1 \
195
		windows_x86_64_msvc-0.36.1
(-)b/devel/gitui/distinfo (-3 / +1 lines)
Lines 1-4 Link Here
1
TIMESTAMP = 1661019816
1
TIMESTAMP = 1667223265
2
SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
2
SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
3
SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
3
SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
4
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
4
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
Lines 201-208 SHA256 (rust/crates/once_cell-1.13.1.crate) = 074864da206b4973b84eb91683020dbefd Link Here
201
SIZE (rust/crates/once_cell-1.13.1.crate) = 31335
201
SIZE (rust/crates/once_cell-1.13.1.crate) = 31335
202
SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
202
SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
203
SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
203
SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
204
SHA256 (rust/crates/openssl-src-111.22.0+1.1.1q.crate) = 8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853
205
SIZE (rust/crates/openssl-src-111.22.0+1.1.1q.crate) = 5103224
206
SHA256 (rust/crates/openssl-sys-0.9.75.crate) = e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f
204
SHA256 (rust/crates/openssl-sys-0.9.75.crate) = e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f
207
SIZE (rust/crates/openssl-sys-0.9.75.crate) = 60028
205
SIZE (rust/crates/openssl-sys-0.9.75.crate) = 60028
208
SHA256 (rust/crates/os_str_bytes-6.3.0.crate) = 9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff
206
SHA256 (rust/crates/os_str_bytes-6.3.0.crate) = 9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff
(-)b/devel/gitui/files/patch-asyncgit_Cargo.toml (+11 lines)
Added Link Here
1
--- asyncgit/Cargo.toml.orig	2022-10-31 13:41:48 UTC
2
+++ asyncgit/Cargo.toml
3
@@ -19,7 +19,7 @@ log = "0.4"
4
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
5
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
6
 # pinning to vendored openssl, using the git2 feature this gets lost with new resolver
7
-openssl-sys = { version = '0.9', features = ["vendored"] }
8
+openssl-sys = { version = '0.9', features = [] }
9
 rayon-core = "1.9"
10
 scopetime = { path = "../scopetime", version = "0.1" }
11
 shellexpand = "2.1"

Return to bug 267469