Page MenuHomeFreeBSD
Files F170794252

D18634.id52252.diff
No OneTemporary
Actions

D18634.id52252.diff
View Options

Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -46,7 +46,7 @@
CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= rust>=1.31.0:lang/rust
+BUILD_DEPENDS+= rust${RUST_DEFAULT:C/.+/-&/}>=1.31.0:lang/rust${RUST_DEFAULT:C/.+/-&/}
.endif
# Location of cargo binary (default to lang/rust's Cargo binary)
Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk
+++ Mk/bsd.gecko.mk
@@ -339,8 +339,7 @@
.endif
.if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
-BUILD_DEPENDS+= ${RUST_PORT:T}>=1.29:${RUST_PORT}
-RUST_PORT?= lang/rust
+BUILD_DEPENDS+= rust${RUST_DEFAULT:C/.+/-&/}>=1.29:lang/rust${RUST_DEFAULT:C/.+/-&/}
. if ${MOZILLA_VER:R:R} < 54
MOZ_OPTIONS+= --enable-rust
. endif
Index: devel/rust-cbindgen/Makefile
===================================================================
--- devel/rust-cbindgen/Makefile
+++ devel/rust-cbindgen/Makefile
@@ -12,7 +12,7 @@
LICENSE= MPL20
-RUN_DEPENDS= cargo:lang/rust
+RUN_DEPENDS= cargo:lang/rust${RUST_DEFAULT:C/.+/-&/}
USES= cargo
USE_GITHUB= yes
Index: net-im/fractal/Makefile
===================================================================
--- net-im/fractal/Makefile
+++ net-im/fractal/Makefile
@@ -13,7 +13,7 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
# gmake for the backtrace-sys crate
-BUILD_DEPENDS= cargo:lang/rust \
+BUILD_DEPENDS= cargo:lang/rust${RUST_DEFAULT:C/.+/-&/} \
gmake:devel/gmake
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libgmp.so:math/gmp \
Index: security/kr/Makefile
===================================================================
--- security/kr/Makefile
+++ security/kr/Makefile
@@ -13,7 +13,7 @@
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= Uses 64bit types
-BUILD_DEPENDS= rust>=1.19.0_2:lang/rust \
+BUILD_DEPENDS= rust${RUST_DEFAULT:C/.+/-&/}>=1.19.0_2:lang/rust${RUST_DEFAULT:C/.+/-&/} \
bash>0:shells/bash
USES= gmake go shebangfix
Index: security/suricata/Makefile
===================================================================
--- security/suricata/Makefile
+++ security/suricata/Makefile
@@ -112,7 +112,7 @@
--with-libhiredis-includes=${LOCALBASE}/include \
--with-libhiredis-libraries=${LOCALBASE}/lib
-RUST_BUILD_DEPENDS= rustc:lang/rust
+RUST_BUILD_DEPENDS= rustc:lang/rust${RUST_DEFAULT:C/.+/-&/}
RUST_CONFIGURE_ENABLE= rust
TESTS_CONFIGURE_ENABLE= unittests
Index: www/cliqz/Makefile
===================================================================
--- www/cliqz/Makefile
+++ www/cliqz/Makefile
@@ -44,7 +44,7 @@
png>=1.6.34:graphics/png \
${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
- rust>=1.28:lang/rust \
+ rust${RUST_DEFAULT:C/.+/-&/}>=1.28:lang/rust${RUST_DEFAULT:C/.+/-&/} \
rust-cbindgen>=0.6.2:devel/rust-cbindgen \
sqlite3>=3.24.0:databases/sqlite3 \
v4l_compat>0:multimedia/v4l_compat \

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 7, 4:17 PM (11 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38475746
Default Alt Text
D18634.id52252.diff (2 KB)

Event Timeline