alacritty: Fix RPATH issues & misc style cleanups

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: alacritty: Fix RPATH issues & misc style cleanups
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Thu, 20 Aug 2020 02:28:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Aug 20 04:28:34 2020 +0200
Changeset:	de6962673698942a1175b96b933ac4a3d4a0f052

Modified Files:
	alacritty/Makefile
	alacritty/TODO
Added Files:
	alacritty/cargo-depends.mk

Log Message:
alacritty: Fix RPATH issues & misc style cleanups

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

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

diffstat:
 alacritty/Makefile         | 295 +++------------------------------------------
 alacritty/TODO             |   7 --
 alacritty/cargo-depends.mk | 259 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 273 insertions(+), 288 deletions(-)

diffs:
diff --git a/alacritty/Makefile b/alacritty/Makefile
index 100b6c819a..f940f72db9 100644
--- a/alacritty/Makefile
+++ b/alacritty/Makefile
@@ -9,298 +9,33 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/jwilm/alacritty
 COMMENT=	Cross-platform, GPU-accelerated terminal emulator
 LICENSE=	apache-2.0
-USE_LANGUAGES+=	c c++
-USE_TOOLS+=	gmake pkg-config # For fontconfig-sys
 
-CARGO_CRATE_DEPENDS+=	adler-0.2.2
-CARGO_CRATE_DEPENDS+=	adler32-1.1.0
-CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.13
-CARGO_CRATE_DEPENDS+=	andrew-0.2.1
-CARGO_CRATE_DEPENDS+=	android_glue-0.2.3
-CARGO_CRATE_DEPENDS+=	android_log-sys-0.1.2
-CARGO_CRATE_DEPENDS+=	ansi_term-0.11.0
-CARGO_CRATE_DEPENDS+=	approx-0.3.2
-CARGO_CRATE_DEPENDS+=	arc-swap-0.4.7
-CARGO_CRATE_DEPENDS+=	arrayref-0.3.6
-CARGO_CRATE_DEPENDS+=	arrayvec-0.5.1
-CARGO_CRATE_DEPENDS+=	atty-0.2.14
-CARGO_CRATE_DEPENDS+=	autocfg-1.0.0
-CARGO_CRATE_DEPENDS+=	base64-0.11.0
-CARGO_CRATE_DEPENDS+=	base64-0.12.3
-CARGO_CRATE_DEPENDS+=	bindgen-0.53.3
-CARGO_CRATE_DEPENDS+=	bitflags-1.2.1
-CARGO_CRATE_DEPENDS+=	blake2b_simd-0.5.10
-CARGO_CRATE_DEPENDS+=	block-0.1.6
-CARGO_CRATE_DEPENDS+=	bytemuck-1.2.0
-CARGO_CRATE_DEPENDS+=	byteorder-1.3.4
-CARGO_CRATE_DEPENDS+=	bzip2-0.3.3
-CARGO_CRATE_DEPENDS+=	bzip2-sys-0.1.9+1.0.8
-CARGO_CRATE_DEPENDS+=	calloop-0.4.4
-CARGO_CRATE_DEPENDS+=	cc-1.0.58
-CARGO_CRATE_DEPENDS+=	cexpr-0.4.0
-CARGO_CRATE_DEPENDS+=	cfg-if-0.1.10
-CARGO_CRATE_DEPENDS+=	cgl-0.3.2
-CARGO_CRATE_DEPENDS+=	clang-sys-0.29.3
-CARGO_CRATE_DEPENDS+=	clap-2.33.1
-CARGO_CRATE_DEPENDS+=	clipboard-win-2.2.0
-CARGO_CRATE_DEPENDS+=	cloudabi-0.0.3
-CARGO_CRATE_DEPENDS+=	cmake-0.1.44
-CARGO_CRATE_DEPENDS+=	cocoa-0.20.2
-CARGO_CRATE_DEPENDS+=	constant_time_eq-0.1.5
-CARGO_CRATE_DEPENDS+=	copypasta-0.7.0
-CARGO_CRATE_DEPENDS+=	core-foundation-0.7.0
-CARGO_CRATE_DEPENDS+=	core-foundation-sys-0.7.0
-CARGO_CRATE_DEPENDS+=	core-graphics-0.19.2
-CARGO_CRATE_DEPENDS+=	core-text-15.0.0
-CARGO_CRATE_DEPENDS+=	core-video-sys-0.1.4
-CARGO_CRATE_DEPENDS+=	crc32fast-1.2.0
-CARGO_CRATE_DEPENDS+=	crossbeam-utils-0.7.2
-CARGO_CRATE_DEPENDS+=	crossfont-0.1.0
-CARGO_CRATE_DEPENDS+=	deflate-0.8.6
-CARGO_CRATE_DEPENDS+=	derivative-2.1.1
-CARGO_CRATE_DEPENDS+=	dirs-2.0.2
-CARGO_CRATE_DEPENDS+=	dirs-sys-0.3.5
-CARGO_CRATE_DEPENDS+=	dispatch-0.2.0
-CARGO_CRATE_DEPENDS+=	dlib-0.4.2
-CARGO_CRATE_DEPENDS+=	downcast-rs-1.2.0
-CARGO_CRATE_DEPENDS+=	dtoa-0.4.6
-CARGO_CRATE_DEPENDS+=	dwrote-0.11.0
-CARGO_CRATE_DEPENDS+=	embed-resource-1.3.3
-CARGO_CRATE_DEPENDS+=	env_logger-0.7.1
-CARGO_CRATE_DEPENDS+=	euclid-0.20.14
-CARGO_CRATE_DEPENDS+=	expat-sys-2.1.6
-CARGO_CRATE_DEPENDS+=	filetime-0.2.10
-CARGO_CRATE_DEPENDS+=	flate2-1.0.16
-CARGO_CRATE_DEPENDS+=	fnv-1.0.7
-CARGO_CRATE_DEPENDS+=	foreign-types-0.3.2
-CARGO_CRATE_DEPENDS+=	foreign-types-0.5.0
-CARGO_CRATE_DEPENDS+=	foreign-types-macros-0.2.1
-CARGO_CRATE_DEPENDS+=	foreign-types-shared-0.1.1
-CARGO_CRATE_DEPENDS+=	foreign-types-shared-0.3.0
-CARGO_CRATE_DEPENDS+=	freetype-rs-0.26.0
-CARGO_CRATE_DEPENDS+=	freetype-sys-0.13.1
-CARGO_CRATE_DEPENDS+=	fsevent-0.4.0
-CARGO_CRATE_DEPENDS+=	fsevent-sys-2.0.1
-CARGO_CRATE_DEPENDS+=	fuchsia-zircon-0.3.3
-CARGO_CRATE_DEPENDS+=	fuchsia-zircon-sys-0.3.3
-CARGO_CRATE_DEPENDS+=	getrandom-0.1.14
-CARGO_CRATE_DEPENDS+=	gl_generator-0.13.1
-CARGO_CRATE_DEPENDS+=	gl_generator-0.14.0
-CARGO_CRATE_DEPENDS+=	glob-0.3.0
-CARGO_CRATE_DEPENDS+=	glutin-0.24.1
-CARGO_CRATE_DEPENDS+=	glutin_egl_sys-0.1.4
-CARGO_CRATE_DEPENDS+=	glutin_emscripten_sys-0.1.1
-CARGO_CRATE_DEPENDS+=	glutin_gles2_sys-0.1.4
-CARGO_CRATE_DEPENDS+=	glutin_glx_sys-0.1.6
-CARGO_CRATE_DEPENDS+=	glutin_wgl_sys-0.1.4
-CARGO_CRATE_DEPENDS+=	hermit-abi-0.1.15
-CARGO_CRATE_DEPENDS+=	http_req-0.5.5
-CARGO_CRATE_DEPENDS+=	humantime-1.3.0
-CARGO_CRATE_DEPENDS+=	image-0.23.6
-CARGO_CRATE_DEPENDS+=	inotify-0.7.1
-CARGO_CRATE_DEPENDS+=	inotify-sys-0.1.3
-CARGO_CRATE_DEPENDS+=	instant-0.1.6
-CARGO_CRATE_DEPENDS+=	iovec-0.1.4
-CARGO_CRATE_DEPENDS+=	itoa-0.4.6
-CARGO_CRATE_DEPENDS+=	jni-sys-0.3.0
-CARGO_CRATE_DEPENDS+=	jobserver-0.1.21
-CARGO_CRATE_DEPENDS+=	kernel32-sys-0.2.2
-CARGO_CRATE_DEPENDS+=	khronos_api-3.1.0
-CARGO_CRATE_DEPENDS+=	lazy_static-1.4.0
-CARGO_CRATE_DEPENDS+=	lazycell-1.2.1
-CARGO_CRATE_DEPENDS+=	libc-0.2.72
-CARGO_CRATE_DEPENDS+=	libloading-0.5.2
-CARGO_CRATE_DEPENDS+=	libloading-0.6.2
-CARGO_CRATE_DEPENDS+=	line_drawing-0.7.0
-CARGO_CRATE_DEPENDS+=	linked-hash-map-0.5.3
-CARGO_CRATE_DEPENDS+=	lock_api-0.3.4
-CARGO_CRATE_DEPENDS+=	log-0.4.8
-CARGO_CRATE_DEPENDS+=	malloc_buf-0.0.6
-CARGO_CRATE_DEPENDS+=	maybe-uninit-2.0.0
-CARGO_CRATE_DEPENDS+=	memchr-2.3.3
-CARGO_CRATE_DEPENDS+=	memmap-0.7.0
-CARGO_CRATE_DEPENDS+=	miniz_oxide-0.3.7
-CARGO_CRATE_DEPENDS+=	miniz_oxide-0.4.0
-CARGO_CRATE_DEPENDS+=	mio-0.6.22
-CARGO_CRATE_DEPENDS+=	mio-anonymous-pipes-0.1.0
-CARGO_CRATE_DEPENDS+=	mio-extras-2.0.6
-CARGO_CRATE_DEPENDS+=	mio-named-pipes-0.1.7
-CARGO_CRATE_DEPENDS+=	miow-0.2.1
-CARGO_CRATE_DEPENDS+=	miow-0.3.5
-CARGO_CRATE_DEPENDS+=	native-tls-0.2.4
-CARGO_CRATE_DEPENDS+=	ndk-0.1.0
-CARGO_CRATE_DEPENDS+=	ndk-glue-0.1.0
-CARGO_CRATE_DEPENDS+=	ndk-sys-0.1.0
-CARGO_CRATE_DEPENDS+=	net2-0.2.34
-CARGO_CRATE_DEPENDS+=	nix-0.14.1
-CARGO_CRATE_DEPENDS+=	nix-0.17.0
-CARGO_CRATE_DEPENDS+=	nom-5.1.2
-CARGO_CRATE_DEPENDS+=	notify-4.0.15
-CARGO_CRATE_DEPENDS+=	num-integer-0.1.43
-CARGO_CRATE_DEPENDS+=	num-iter-0.1.41
-CARGO_CRATE_DEPENDS+=	num-rational-0.3.0
-CARGO_CRATE_DEPENDS+=	num-traits-0.2.12
-CARGO_CRATE_DEPENDS+=	num_enum-0.4.3
-CARGO_CRATE_DEPENDS+=	num_enum_derive-0.4.3
-CARGO_CRATE_DEPENDS+=	objc-0.2.7
-CARGO_CRATE_DEPENDS+=	objc-foundation-0.1.1
-CARGO_CRATE_DEPENDS+=	objc_id-0.1.1
-CARGO_CRATE_DEPENDS+=	once_cell-1.4.0
-CARGO_CRATE_DEPENDS+=	openssl-0.10.30
-CARGO_CRATE_DEPENDS+=	openssl-probe-0.1.2
-CARGO_CRATE_DEPENDS+=	openssl-sys-0.9.58
-CARGO_CRATE_DEPENDS+=	ordered-float-1.1.0
-CARGO_CRATE_DEPENDS+=	osmesa-sys-0.1.2
-CARGO_CRATE_DEPENDS+=	parking_lot-0.10.2
-CARGO_CRATE_DEPENDS+=	parking_lot_core-0.7.2
-CARGO_CRATE_DEPENDS+=	peeking_take_while-0.1.2
-CARGO_CRATE_DEPENDS+=	percent-encoding-2.1.0
-CARGO_CRATE_DEPENDS+=	phf-0.8.0
-CARGO_CRATE_DEPENDS+=	phf_codegen-0.8.0
-CARGO_CRATE_DEPENDS+=	phf_generator-0.8.0
-CARGO_CRATE_DEPENDS+=	phf_shared-0.8.0
-CARGO_CRATE_DEPENDS+=	pkg-config-0.3.17
-CARGO_CRATE_DEPENDS+=	png-0.16.6
-CARGO_CRATE_DEPENDS+=	podio-0.1.7
-CARGO_CRATE_DEPENDS+=	ppv-lite86-0.2.8
-CARGO_CRATE_DEPENDS+=	proc-macro-crate-0.1.4
-CARGO_CRATE_DEPENDS+=	proc-macro2-0.4.30
-CARGO_CRATE_DEPENDS+=	proc-macro2-1.0.18
-CARGO_CRATE_DEPENDS+=	quick-error-1.2.3
-CARGO_CRATE_DEPENDS+=	quote-0.6.13
-CARGO_CRATE_DEPENDS+=	quote-1.0.7
-CARGO_CRATE_DEPENDS+=	rand-0.7.3
-CARGO_CRATE_DEPENDS+=	rand_chacha-0.2.2
-CARGO_CRATE_DEPENDS+=	rand_core-0.5.1
-CARGO_CRATE_DEPENDS+=	rand_hc-0.2.0
-CARGO_CRATE_DEPENDS+=	rand_pcg-0.2.1
-CARGO_CRATE_DEPENDS+=	raw-window-handle-0.3.3
-CARGO_CRATE_DEPENDS+=	redox_syscall-0.1.56
-CARGO_CRATE_DEPENDS+=	redox_users-0.3.4
-CARGO_CRATE_DEPENDS+=	regex-1.3.9
-CARGO_CRATE_DEPENDS+=	regex-automata-0.1.9
-CARGO_CRATE_DEPENDS+=	regex-syntax-0.6.18
-CARGO_CRATE_DEPENDS+=	remove_dir_all-0.5.3
-CARGO_CRATE_DEPENDS+=	rust-argon2-0.7.0
-CARGO_CRATE_DEPENDS+=	rustc-hash-1.1.0
-CARGO_CRATE_DEPENDS+=	rustc_tools_util-0.2.0
-CARGO_CRATE_DEPENDS+=	rusttype-0.7.9
-CARGO_CRATE_DEPENDS+=	rusttype-0.8.3
-CARGO_CRATE_DEPENDS+=	ryu-1.0.5
-CARGO_CRATE_DEPENDS+=	same-file-1.0.6
-CARGO_CRATE_DEPENDS+=	schannel-0.1.19
-CARGO_CRATE_DEPENDS+=	scoped-tls-1.0.0
-CARGO_CRATE_DEPENDS+=	scopeguard-1.1.0
-CARGO_CRATE_DEPENDS+=	security-framework-0.4.4
-CARGO_CRATE_DEPENDS+=	security-framework-sys-0.4.3
-CARGO_CRATE_DEPENDS+=	serde-1.0.114
-CARGO_CRATE_DEPENDS+=	serde_derive-1.0.114
-CARGO_CRATE_DEPENDS+=	serde_json-1.0.56
-CARGO_CRATE_DEPENDS+=	serde_yaml-0.8.13
-CARGO_CRATE_DEPENDS+=	servo-fontconfig-0.5.1
-CARGO_CRATE_DEPENDS+=	servo-fontconfig-sys-5.1.0
-CARGO_CRATE_DEPENDS+=	shared_library-0.1.9
-CARGO_CRATE_DEPENDS+=	shlex-0.1.1
-CARGO_CRATE_DEPENDS+=	signal-hook-0.1.16
-CARGO_CRATE_DEPENDS+=	signal-hook-registry-1.2.0
-CARGO_CRATE_DEPENDS+=	siphasher-0.3.3
-CARGO_CRATE_DEPENDS+=	slab-0.4.2
-CARGO_CRATE_DEPENDS+=	smallvec-1.4.1
-CARGO_CRATE_DEPENDS+=	smithay-client-toolkit-0.6.6
-CARGO_CRATE_DEPENDS+=	smithay-client-toolkit-0.10.0
-CARGO_CRATE_DEPENDS+=	smithay-clipboard-0.5.1
-CARGO_CRATE_DEPENDS+=	socket2-0.3.12
-CARGO_CRATE_DEPENDS+=	spsc-buffer-0.1.1
-CARGO_CRATE_DEPENDS+=	stb_truetype-0.3.1
-CARGO_CRATE_DEPENDS+=	strsim-0.8.0
-CARGO_CRATE_DEPENDS+=	syn-1.0.33
-CARGO_CRATE_DEPENDS+=	tempfile-3.1.0
-CARGO_CRATE_DEPENDS+=	termcolor-1.1.0
-CARGO_CRATE_DEPENDS+=	terminfo-0.7.3
-CARGO_CRATE_DEPENDS+=	textwrap-0.11.0
-CARGO_CRATE_DEPENDS+=	thread_local-1.0.1
-CARGO_CRATE_DEPENDS+=	time-0.1.43
-CARGO_CRATE_DEPENDS+=	toml-0.5.6
-CARGO_CRATE_DEPENDS+=	unicase-2.6.0
-CARGO_CRATE_DEPENDS+=	unicode-width-0.1.8
-CARGO_CRATE_DEPENDS+=	unicode-xid-0.1.0
-CARGO_CRATE_DEPENDS+=	unicode-xid-0.2.1
-CARGO_CRATE_DEPENDS+=	urlocator-0.1.4
-CARGO_CRATE_DEPENDS+=	utf8parse-0.2.0
-CARGO_CRATE_DEPENDS+=	vcpkg-0.2.10
-CARGO_CRATE_DEPENDS+=	vec_map-0.8.2
-CARGO_CRATE_DEPENDS+=	version_check-0.9.2
-CARGO_CRATE_DEPENDS+=	void-1.0.2
-CARGO_CRATE_DEPENDS+=	vswhom-0.1.0
-CARGO_CRATE_DEPENDS+=	vswhom-sys-0.1.0
-CARGO_CRATE_DEPENDS+=	vte-0.8.0
-CARGO_CRATE_DEPENDS+=	vte_generate_state_changes-0.1.1
-CARGO_CRATE_DEPENDS+=	walkdir-2.3.1
-CARGO_CRATE_DEPENDS+=	wasi-0.9.0+wasi-snapshot-preview1
-CARGO_CRATE_DEPENDS+=	wayland-client-0.23.6
-CARGO_CRATE_DEPENDS+=	wayland-client-0.27.0
-CARGO_CRATE_DEPENDS+=	wayland-commons-0.23.6
-CARGO_CRATE_DEPENDS+=	wayland-commons-0.27.0
-CARGO_CRATE_DEPENDS+=	wayland-cursor-0.27.0
-CARGO_CRATE_DEPENDS+=	wayland-protocols-0.23.6
-CARGO_CRATE_DEPENDS+=	wayland-protocols-0.27.0
-CARGO_CRATE_DEPENDS+=	wayland-scanner-0.23.6
-CARGO_CRATE_DEPENDS+=	wayland-scanner-0.27.0
-CARGO_CRATE_DEPENDS+=	wayland-sys-0.23.6
-CARGO_CRATE_DEPENDS+=	wayland-sys-0.27.0
-CARGO_CRATE_DEPENDS+=	which-3.1.1
-CARGO_CRATE_DEPENDS+=	winapi-0.2.8
-CARGO_CRATE_DEPENDS+=	winapi-0.3.9
-CARGO_CRATE_DEPENDS+=	winapi-build-0.1.1
-CARGO_CRATE_DEPENDS+=	winapi-i686-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+=	winapi-util-0.1.5
-CARGO_CRATE_DEPENDS+=	winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+=	winit-0.22.2
-CARGO_CRATE_DEPENDS+=	winpty-0.2.0
-CARGO_CRATE_DEPENDS+=	winpty-sys-0.5.0
-CARGO_CRATE_DEPENDS+=	winreg-0.6.2
-CARGO_CRATE_DEPENDS+=	wio-0.2.2
-CARGO_CRATE_DEPENDS+=	ws2_32-sys-0.2.1
-CARGO_CRATE_DEPENDS+=	x11-clipboard-0.5.1
-CARGO_CRATE_DEPENDS+=	x11-dl-2.18.5
-CARGO_CRATE_DEPENDS+=	xcb-0.9.0
-CARGO_CRATE_DEPENDS+=	xcursor-0.3.2
-CARGO_CRATE_DEPENDS+=	xdg-2.2.0
-CARGO_CRATE_DEPENDS+=	xml-rs-0.8.3
-CARGO_CRATE_DEPENDS+=	yaml-rust-0.4.4
-CARGO_CRATE_DEPENDS+=	zip-0.5.6
+BUILD_DEPENDS+=		cmake-[0-9]*:../../devel/cmake
 
-INSTALLATION_DIRS=	bin
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		gmake pkg-config	# for fontconfig-sys
 
-#DEPENDS+=	xcb-[0-9]*:../../x11/xcb
+.include "cargo-depends.mk"
 
-# These are reported as missing in run-time search paths on NetBSD/amd64
-# -lxcb -lfontconfig -lfreetype
-#MAKE_ENV+=	RUSTFLAGS="-I${BUILDLINK_PREFIX.libxcb} -lxcb -I${BUILDLINK_PREFIX.fontconfig} -lfontconfig -I${BUILDLINK_PREFIX.freetype2} -lfreetype"
-#MAKE_ENV+=	RUSTFLAGS="-L native=${BUILDLINK_PREFIX.libxcb} -lxcb -L native=${BUILDLINK_PREFIX.fontconfig} -lfontconfig -L native=${BUILDLINK_PREFIX.freetype2} -lfreetype"
-#MAKE_ENV+=	RUSTFLAGS=-C link-args="-Wl,-R ${BUILDLINK_PREFIX.libxcb}/lib -Wl,-R ${BUILDLINK_PREFIX.fontconfig}/lib -Wl,-R ${BUILDLINK_PREFIX.freetype2}/lib"
+#DEPENDS+=	xcb-[0-9]*:../../x11/xcb
 
-MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+MAKE_ENV+=	OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
+RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
+RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
+MAKE_ENV+=	RUSTFLAGS=${RUSTFLAGS:Q}
 
+# TODO: doesn't include dlopen.bl3.mk?
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
-BUILD_DEPENDS+=		cmake-[0-9]*:../../devel/cmake
-
 # The xcb 0.8.2 crate depends on any version of python 3.
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_FOR_BUILD_ONLY=		yes
+PYTHON_FOR_BUILD_ONLY=		tool
 BUILD_DEPENDS+=			${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 #REPLACE_PYTHON+=		../vendor/xcb-0.8.2/rs-client.py
 #REPLACE_PYTHON+=		../vendor/xcb-0.8.2/build.rs
 
-
-.include "../../lang/rust/cargo.mk"
-
-# Should we start using a cargo config file in our builds?
-# https://doc.rust-lang.org/cargo/reference/config.html
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --verbose --locked --frozen --release -j${_MAKE_JOBS_N}
-	# cd ${WRKSRC} && ${PREFIX}/bin/cargo build --verbose --locked --frozen --release -j${_MAKE_JOBS_N}
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin
@@ -309,10 +44,8 @@ do-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 #.include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-.include "../../lang/python/application.mk"
-#.include "../../lang/rust/cargo.mk"
+.include "../../lang/rust/cargo.mk"
 #.include "../../lang/rust/buildlink3.mk"
-.include "../../lang/rust/rust.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 # .include "../../x11/xcb-util/buildlink3.mk"
diff --git a/alacritty/TODO b/alacritty/TODO
index 556fe7ee35..725585293f 100644
--- a/alacritty/TODO
+++ b/alacritty/TODO
@@ -1,10 +1,3 @@
 * This package tracks https://github.com/jwilm/alacritty/issues/2631,
   which is why the build is not done from a release tarball. The ticket
   aims to fix NetBSD builds for alacritty.
-
-TODO:
-=> Checking for missing run-time search paths in alacritty-v0.5.0
-ERROR: bin/alacritty: missing library: libfreetype.so.19
-ERROR: bin/alacritty: missing library: libfontconfig.so.2
-ERROR: bin/alacritty: missing library: libxcb.so.2
-*** Error code 1
diff --git a/alacritty/cargo-depends.mk b/alacritty/cargo-depends.mk
new file mode 100644
index 0000000000..fbaa66583a
--- /dev/null
+++ b/alacritty/cargo-depends.mk
@@ -0,0 +1,259 @@
+# $NetBSD$
+
+CARGO_CRATE_DEPENDS+=	adler-0.2.2
+CARGO_CRATE_DEPENDS+=	adler32-1.1.0
+CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.13
+CARGO_CRATE_DEPENDS+=	andrew-0.2.1
+CARGO_CRATE_DEPENDS+=	android_glue-0.2.3
+CARGO_CRATE_DEPENDS+=	android_log-sys-0.1.2
+CARGO_CRATE_DEPENDS+=	ansi_term-0.11.0
+CARGO_CRATE_DEPENDS+=	approx-0.3.2
+CARGO_CRATE_DEPENDS+=	arc-swap-0.4.7
+CARGO_CRATE_DEPENDS+=	arrayref-0.3.6
+CARGO_CRATE_DEPENDS+=	arrayvec-0.5.1
+CARGO_CRATE_DEPENDS+=	atty-0.2.14
+CARGO_CRATE_DEPENDS+=	autocfg-1.0.0
+CARGO_CRATE_DEPENDS+=	base64-0.11.0
+CARGO_CRATE_DEPENDS+=	base64-0.12.3
+CARGO_CRATE_DEPENDS+=	bindgen-0.53.3
+CARGO_CRATE_DEPENDS+=	bitflags-1.2.1
+CARGO_CRATE_DEPENDS+=	blake2b_simd-0.5.10
+CARGO_CRATE_DEPENDS+=	block-0.1.6
+CARGO_CRATE_DEPENDS+=	bytemuck-1.2.0
+CARGO_CRATE_DEPENDS+=	byteorder-1.3.4
+CARGO_CRATE_DEPENDS+=	bzip2-0.3.3
+CARGO_CRATE_DEPENDS+=	bzip2-sys-0.1.9+1.0.8
+CARGO_CRATE_DEPENDS+=	calloop-0.4.4
+CARGO_CRATE_DEPENDS+=	cc-1.0.58
+CARGO_CRATE_DEPENDS+=	cexpr-0.4.0
+CARGO_CRATE_DEPENDS+=	cfg-if-0.1.10
+CARGO_CRATE_DEPENDS+=	cgl-0.3.2
+CARGO_CRATE_DEPENDS+=	clang-sys-0.29.3
+CARGO_CRATE_DEPENDS+=	clap-2.33.1
+CARGO_CRATE_DEPENDS+=	clipboard-win-2.2.0
+CARGO_CRATE_DEPENDS+=	cloudabi-0.0.3
+CARGO_CRATE_DEPENDS+=	cmake-0.1.44
+CARGO_CRATE_DEPENDS+=	cocoa-0.20.2
+CARGO_CRATE_DEPENDS+=	constant_time_eq-0.1.5
+CARGO_CRATE_DEPENDS+=	copypasta-0.7.0
+CARGO_CRATE_DEPENDS+=	core-foundation-0.7.0
+CARGO_CRATE_DEPENDS+=	core-foundation-sys-0.7.0
+CARGO_CRATE_DEPENDS+=	core-graphics-0.19.2
+CARGO_CRATE_DEPENDS+=	core-text-15.0.0
+CARGO_CRATE_DEPENDS+=	core-video-sys-0.1.4
+CARGO_CRATE_DEPENDS+=	crc32fast-1.2.0
+CARGO_CRATE_DEPENDS+=	crossbeam-utils-0.7.2
+CARGO_CRATE_DEPENDS+=	crossfont-0.1.0
+CARGO_CRATE_DEPENDS+=	deflate-0.8.6
+CARGO_CRATE_DEPENDS+=	derivative-2.1.1
+CARGO_CRATE_DEPENDS+=	dirs-2.0.2
+CARGO_CRATE_DEPENDS+=	dirs-sys-0.3.5
+CARGO_CRATE_DEPENDS+=	dispatch-0.2.0
+CARGO_CRATE_DEPENDS+=	dlib-0.4.2
+CARGO_CRATE_DEPENDS+=	downcast-rs-1.2.0
+CARGO_CRATE_DEPENDS+=	dtoa-0.4.6
+CARGO_CRATE_DEPENDS+=	dwrote-0.11.0
+CARGO_CRATE_DEPENDS+=	embed-resource-1.3.3
+CARGO_CRATE_DEPENDS+=	env_logger-0.7.1
+CARGO_CRATE_DEPENDS+=	euclid-0.20.14
+CARGO_CRATE_DEPENDS+=	expat-sys-2.1.6
+CARGO_CRATE_DEPENDS+=	filetime-0.2.10
+CARGO_CRATE_DEPENDS+=	flate2-1.0.16
+CARGO_CRATE_DEPENDS+=	fnv-1.0.7
+CARGO_CRATE_DEPENDS+=	foreign-types-0.3.2
+CARGO_CRATE_DEPENDS+=	foreign-types-0.5.0
+CARGO_CRATE_DEPENDS+=	foreign-types-macros-0.2.1
+CARGO_CRATE_DEPENDS+=	foreign-types-shared-0.1.1
+CARGO_CRATE_DEPENDS+=	foreign-types-shared-0.3.0
+CARGO_CRATE_DEPENDS+=	freetype-rs-0.26.0
+CARGO_CRATE_DEPENDS+=	freetype-sys-0.13.1
+CARGO_CRATE_DEPENDS+=	fsevent-0.4.0
+CARGO_CRATE_DEPENDS+=	fsevent-sys-2.0.1
+CARGO_CRATE_DEPENDS+=	fuchsia-zircon-0.3.3
+CARGO_CRATE_DEPENDS+=	fuchsia-zircon-sys-0.3.3
+CARGO_CRATE_DEPENDS+=	getrandom-0.1.14
+CARGO_CRATE_DEPENDS+=	gl_generator-0.13.1
+CARGO_CRATE_DEPENDS+=	gl_generator-0.14.0
+CARGO_CRATE_DEPENDS+=	glob-0.3.0
+CARGO_CRATE_DEPENDS+=	glutin-0.24.1
+CARGO_CRATE_DEPENDS+=	glutin_egl_sys-0.1.4
+CARGO_CRATE_DEPENDS+=	glutin_emscripten_sys-0.1.1
+CARGO_CRATE_DEPENDS+=	glutin_gles2_sys-0.1.4
+CARGO_CRATE_DEPENDS+=	glutin_glx_sys-0.1.6
+CARGO_CRATE_DEPENDS+=	glutin_wgl_sys-0.1.4
+CARGO_CRATE_DEPENDS+=	hermit-abi-0.1.15
+CARGO_CRATE_DEPENDS+=	http_req-0.5.5
+CARGO_CRATE_DEPENDS+=	humantime-1.3.0
+CARGO_CRATE_DEPENDS+=	image-0.23.6
+CARGO_CRATE_DEPENDS+=	inotify-0.7.1
+CARGO_CRATE_DEPENDS+=	inotify-sys-0.1.3
+CARGO_CRATE_DEPENDS+=	instant-0.1.6
+CARGO_CRATE_DEPENDS+=	iovec-0.1.4
+CARGO_CRATE_DEPENDS+=	itoa-0.4.6
+CARGO_CRATE_DEPENDS+=	jni-sys-0.3.0
+CARGO_CRATE_DEPENDS+=	jobserver-0.1.21
+CARGO_CRATE_DEPENDS+=	kernel32-sys-0.2.2
+CARGO_CRATE_DEPENDS+=	khronos_api-3.1.0
+CARGO_CRATE_DEPENDS+=	lazy_static-1.4.0
+CARGO_CRATE_DEPENDS+=	lazycell-1.2.1
+CARGO_CRATE_DEPENDS+=	libc-0.2.72
+CARGO_CRATE_DEPENDS+=	libloading-0.5.2
+CARGO_CRATE_DEPENDS+=	libloading-0.6.2
+CARGO_CRATE_DEPENDS+=	line_drawing-0.7.0
+CARGO_CRATE_DEPENDS+=	linked-hash-map-0.5.3
+CARGO_CRATE_DEPENDS+=	lock_api-0.3.4
+CARGO_CRATE_DEPENDS+=	log-0.4.8
+CARGO_CRATE_DEPENDS+=	malloc_buf-0.0.6
+CARGO_CRATE_DEPENDS+=	maybe-uninit-2.0.0
+CARGO_CRATE_DEPENDS+=	memchr-2.3.3
+CARGO_CRATE_DEPENDS+=	memmap-0.7.0
+CARGO_CRATE_DEPENDS+=	miniz_oxide-0.3.7
+CARGO_CRATE_DEPENDS+=	miniz_oxide-0.4.0
+CARGO_CRATE_DEPENDS+=	mio-0.6.22
+CARGO_CRATE_DEPENDS+=	mio-anonymous-pipes-0.1.0
+CARGO_CRATE_DEPENDS+=	mio-extras-2.0.6
+CARGO_CRATE_DEPENDS+=	mio-named-pipes-0.1.7
+CARGO_CRATE_DEPENDS+=	miow-0.2.1
+CARGO_CRATE_DEPENDS+=	miow-0.3.5
+CARGO_CRATE_DEPENDS+=	native-tls-0.2.4
+CARGO_CRATE_DEPENDS+=	ndk-0.1.0
+CARGO_CRATE_DEPENDS+=	ndk-glue-0.1.0
+CARGO_CRATE_DEPENDS+=	ndk-sys-0.1.0
+CARGO_CRATE_DEPENDS+=	net2-0.2.34
+CARGO_CRATE_DEPENDS+=	nix-0.14.1
+CARGO_CRATE_DEPENDS+=	nix-0.17.0
+CARGO_CRATE_DEPENDS+=	nom-5.1.2
+CARGO_CRATE_DEPENDS+=	notify-4.0.15
+CARGO_CRATE_DEPENDS+=	num-integer-0.1.43
+CARGO_CRATE_DEPENDS+=	num-iter-0.1.41
+CARGO_CRATE_DEPENDS+=	num-rational-0.3.0
+CARGO_CRATE_DEPENDS+=	num-traits-0.2.12
+CARGO_CRATE_DEPENDS+=	num_enum-0.4.3
+CARGO_CRATE_DEPENDS+=	num_enum_derive-0.4.3
+CARGO_CRATE_DEPENDS+=	objc-0.2.7
+CARGO_CRATE_DEPENDS+=	objc-foundation-0.1.1
+CARGO_CRATE_DEPENDS+=	objc_id-0.1.1
+CARGO_CRATE_DEPENDS+=	once_cell-1.4.0
+CARGO_CRATE_DEPENDS+=	openssl-0.10.30
+CARGO_CRATE_DEPENDS+=	openssl-probe-0.1.2
+CARGO_CRATE_DEPENDS+=	openssl-sys-0.9.58
+CARGO_CRATE_DEPENDS+=	ordered-float-1.1.0
+CARGO_CRATE_DEPENDS+=	osmesa-sys-0.1.2
+CARGO_CRATE_DEPENDS+=	parking_lot-0.10.2
+CARGO_CRATE_DEPENDS+=	parking_lot_core-0.7.2
+CARGO_CRATE_DEPENDS+=	peeking_take_while-0.1.2
+CARGO_CRATE_DEPENDS+=	percent-encoding-2.1.0
+CARGO_CRATE_DEPENDS+=	phf-0.8.0
+CARGO_CRATE_DEPENDS+=	phf_codegen-0.8.0
+CARGO_CRATE_DEPENDS+=	phf_generator-0.8.0
+CARGO_CRATE_DEPENDS+=	phf_shared-0.8.0
+CARGO_CRATE_DEPENDS+=	pkg-config-0.3.17
+CARGO_CRATE_DEPENDS+=	png-0.16.6
+CARGO_CRATE_DEPENDS+=	podio-0.1.7
+CARGO_CRATE_DEPENDS+=	ppv-lite86-0.2.8
+CARGO_CRATE_DEPENDS+=	proc-macro-crate-0.1.4
+CARGO_CRATE_DEPENDS+=	proc-macro2-0.4.30
+CARGO_CRATE_DEPENDS+=	proc-macro2-1.0.18
+CARGO_CRATE_DEPENDS+=	quick-error-1.2.3
+CARGO_CRATE_DEPENDS+=	quote-0.6.13
+CARGO_CRATE_DEPENDS+=	quote-1.0.7
+CARGO_CRATE_DEPENDS+=	rand-0.7.3
+CARGO_CRATE_DEPENDS+=	rand_chacha-0.2.2
+CARGO_CRATE_DEPENDS+=	rand_core-0.5.1
+CARGO_CRATE_DEPENDS+=	rand_hc-0.2.0
+CARGO_CRATE_DEPENDS+=	rand_pcg-0.2.1
+CARGO_CRATE_DEPENDS+=	raw-window-handle-0.3.3
+CARGO_CRATE_DEPENDS+=	redox_syscall-0.1.56
+CARGO_CRATE_DEPENDS+=	redox_users-0.3.4
+CARGO_CRATE_DEPENDS+=	regex-1.3.9
+CARGO_CRATE_DEPENDS+=	regex-automata-0.1.9
+CARGO_CRATE_DEPENDS+=	regex-syntax-0.6.18
+CARGO_CRATE_DEPENDS+=	remove_dir_all-0.5.3
+CARGO_CRATE_DEPENDS+=	rust-argon2-0.7.0
+CARGO_CRATE_DEPENDS+=	rustc-hash-1.1.0
+CARGO_CRATE_DEPENDS+=	rustc_tools_util-0.2.0
+CARGO_CRATE_DEPENDS+=	rusttype-0.7.9
+CARGO_CRATE_DEPENDS+=	rusttype-0.8.3
+CARGO_CRATE_DEPENDS+=	ryu-1.0.5
+CARGO_CRATE_DEPENDS+=	same-file-1.0.6
+CARGO_CRATE_DEPENDS+=	schannel-0.1.19
+CARGO_CRATE_DEPENDS+=	scoped-tls-1.0.0
+CARGO_CRATE_DEPENDS+=	scopeguard-1.1.0
+CARGO_CRATE_DEPENDS+=	security-framework-0.4.4
+CARGO_CRATE_DEPENDS+=	security-framework-sys-0.4.3
+CARGO_CRATE_DEPENDS+=	serde-1.0.114
+CARGO_CRATE_DEPENDS+=	serde_derive-1.0.114
+CARGO_CRATE_DEPENDS+=	serde_json-1.0.56
+CARGO_CRATE_DEPENDS+=	serde_yaml-0.8.13
+CARGO_CRATE_DEPENDS+=	servo-fontconfig-0.5.1
+CARGO_CRATE_DEPENDS+=	servo-fontconfig-sys-5.1.0
+CARGO_CRATE_DEPENDS+=	shared_library-0.1.9
+CARGO_CRATE_DEPENDS+=	shlex-0.1.1
+CARGO_CRATE_DEPENDS+=	signal-hook-0.1.16
+CARGO_CRATE_DEPENDS+=	signal-hook-registry-1.2.0
+CARGO_CRATE_DEPENDS+=	siphasher-0.3.3
+CARGO_CRATE_DEPENDS+=	slab-0.4.2
+CARGO_CRATE_DEPENDS+=	smallvec-1.4.1
+CARGO_CRATE_DEPENDS+=	smithay-client-toolkit-0.6.6
+CARGO_CRATE_DEPENDS+=	smithay-client-toolkit-0.10.0
+CARGO_CRATE_DEPENDS+=	smithay-clipboard-0.5.1
+CARGO_CRATE_DEPENDS+=	socket2-0.3.12
+CARGO_CRATE_DEPENDS+=	spsc-buffer-0.1.1
+CARGO_CRATE_DEPENDS+=	stb_truetype-0.3.1
+CARGO_CRATE_DEPENDS+=	strsim-0.8.0
+CARGO_CRATE_DEPENDS+=	syn-1.0.33
+CARGO_CRATE_DEPENDS+=	tempfile-3.1.0
+CARGO_CRATE_DEPENDS+=	termcolor-1.1.0
+CARGO_CRATE_DEPENDS+=	terminfo-0.7.3
+CARGO_CRATE_DEPENDS+=	textwrap-0.11.0
+CARGO_CRATE_DEPENDS+=	thread_local-1.0.1
+CARGO_CRATE_DEPENDS+=	time-0.1.43
+CARGO_CRATE_DEPENDS+=	toml-0.5.6
+CARGO_CRATE_DEPENDS+=	unicase-2.6.0
+CARGO_CRATE_DEPENDS+=	unicode-width-0.1.8
+CARGO_CRATE_DEPENDS+=	unicode-xid-0.1.0
+CARGO_CRATE_DEPENDS+=	unicode-xid-0.2.1
+CARGO_CRATE_DEPENDS+=	urlocator-0.1.4
+CARGO_CRATE_DEPENDS+=	utf8parse-0.2.0
+CARGO_CRATE_DEPENDS+=	vcpkg-0.2.10
+CARGO_CRATE_DEPENDS+=	vec_map-0.8.2
+CARGO_CRATE_DEPENDS+=	version_check-0.9.2
+CARGO_CRATE_DEPENDS+=	void-1.0.2
+CARGO_CRATE_DEPENDS+=	vswhom-0.1.0
+CARGO_CRATE_DEPENDS+=	vswhom-sys-0.1.0
+CARGO_CRATE_DEPENDS+=	vte-0.8.0
+CARGO_CRATE_DEPENDS+=	vte_generate_state_changes-0.1.1
+CARGO_CRATE_DEPENDS+=	walkdir-2.3.1
+CARGO_CRATE_DEPENDS+=	wasi-0.9.0+wasi-snapshot-preview1
+CARGO_CRATE_DEPENDS+=	wayland-client-0.23.6
+CARGO_CRATE_DEPENDS+=	wayland-client-0.27.0
+CARGO_CRATE_DEPENDS+=	wayland-commons-0.23.6
+CARGO_CRATE_DEPENDS+=	wayland-commons-0.27.0
+CARGO_CRATE_DEPENDS+=	wayland-cursor-0.27.0
+CARGO_CRATE_DEPENDS+=	wayland-protocols-0.23.6
+CARGO_CRATE_DEPENDS+=	wayland-protocols-0.27.0
+CARGO_CRATE_DEPENDS+=	wayland-scanner-0.23.6
+CARGO_CRATE_DEPENDS+=	wayland-scanner-0.27.0
+CARGO_CRATE_DEPENDS+=	wayland-sys-0.23.6
+CARGO_CRATE_DEPENDS+=	wayland-sys-0.27.0
+CARGO_CRATE_DEPENDS+=	which-3.1.1
+CARGO_CRATE_DEPENDS+=	winapi-0.2.8
+CARGO_CRATE_DEPENDS+=	winapi-0.3.9
+CARGO_CRATE_DEPENDS+=	winapi-build-0.1.1
+CARGO_CRATE_DEPENDS+=	winapi-i686-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+=	winapi-util-0.1.5
+CARGO_CRATE_DEPENDS+=	winapi-x86_64-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+=	winit-0.22.2
+CARGO_CRATE_DEPENDS+=	winpty-0.2.0
+CARGO_CRATE_DEPENDS+=	winpty-sys-0.5.0
+CARGO_CRATE_DEPENDS+=	winreg-0.6.2
+CARGO_CRATE_DEPENDS+=	wio-0.2.2
+CARGO_CRATE_DEPENDS+=	ws2_32-sys-0.2.1
+CARGO_CRATE_DEPENDS+=	x11-clipboard-0.5.1
+CARGO_CRATE_DEPENDS+=	x11-dl-2.18.5
+CARGO_CRATE_DEPENDS+=	xcb-0.9.0
+CARGO_CRATE_DEPENDS+=	xcursor-0.3.2
+CARGO_CRATE_DEPENDS+=	xdg-2.2.0
+CARGO_CRATE_DEPENDS+=	xml-rs-0.8.3
+CARGO_CRATE_DEPENDS+=	yaml-rust-0.4.4
+CARGO_CRATE_DEPENDS+=	zip-0.5.6
Prev by Date: ncspot: remove unused LDFLAGS setting
Next by Date: alacritty: add upstream patch for NetBSD
Previous by Thread: ncspot: remove unused LDFLAGS setting
Next by Thread: alacritty: add upstream patch for NetBSD
Indexes:
Home | Main Index | Thread Index | Old Index