svn commit: r489241 - in head: Mk Mk/Uses devel/rust-cbindgen net-im/fractal security/kr security/suricata www/cliqz

[Jan Beich]

Author: jbeich
Date: Fri Jan  4 04:00:39 2019
New Revision: 489241
URL: https://svnweb.freebsd.org/changeset/ports/489241

Log:
  Allow overriding rust dependency
  
  Add DEFAULT_VERSIONS+=rust=rust-nightly to make.conf(5) if you want to
  build consumers using lang/rust-nightly.
  
  Approved by:	rust (tobik)
  MFH:		2019Q1 (avoid merge conflicts during www/firefox updates)
  Differential Revision:	https://reviews.freebsd.org/D18634

Modified:
  head/Mk/Uses/cargo.mk   (contents, props changed)
  head/Mk/bsd.default-versions.mk   (contents, props changed)
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/devel/rust-cbindgen/Makefile   (contents, props changed)
  head/net-im/fractal/Makefile   (contents, props changed)
  head/security/kr/Makefile   (contents, props changed)
  head/security/suricata/Makefile   (contents, props changed)
  head/www/cliqz/Makefile   (contents, props changed)

Modified: head/Mk/Uses/cargo.mk
==============================================================================
--- head/Mk/Uses/cargo.mk	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/Mk/Uses/cargo.mk	Fri Jan  4 04:00:39 2019	(r489241)
@@ -46,7 +46,7 @@ DISTFILES+=	${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:carg
 
 CARGO_BUILDDEP?=	yes
 .if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	 rust>=1.31.0:lang/rust
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.31.0:lang/${RUST_DEFAULT}
 .endif
 
 # Location of cargo binary (default to lang/rust's Cargo binary)

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/Mk/bsd.default-versions.mk	Fri Jan  4 04:00:39 2019	(r489241)
@@ -88,6 +88,8 @@ PYTHON2_DEFAULT?=	2.7
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.3, 2.4, 2.5
 RUBY_DEFAULT?=		2.4
+# Possible values: rust, rust-nightly
+RUST_DEFAULT?=		rust
 # Possible values: 4.6, 4.7, 4.8
 SAMBA_DEFAULT?=		4.7
 # Possible values: base, openssl, openssl111, libressl, libressl-devel

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/Mk/bsd.gecko.mk	Fri Jan  4 04:00:39 2019	(r489241)
@@ -339,8 +339,7 @@ post-patch-SNDIO-on:
 .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_DEFAULT}>=1.29:lang/${RUST_DEFAULT}
 . if ${MOZILLA_VER:R:R} < 54
 MOZ_OPTIONS+=	--enable-rust
 . endif

Modified: head/devel/rust-cbindgen/Makefile
==============================================================================
--- head/devel/rust-cbindgen/Makefile	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/devel/rust-cbindgen/Makefile	Fri Jan  4 04:00:39 2019	(r489241)
@@ -12,7 +12,7 @@ COMMENT=	Generate C bindings from Rust code
 
 LICENSE=	MPL20
 
-RUN_DEPENDS=	cargo:lang/rust
+RUN_DEPENDS=	cargo:lang/${RUST_DEFAULT}
 
 USES=		cargo
 USE_GITHUB=	yes

Modified: head/net-im/fractal/Makefile
==============================================================================
--- head/net-im/fractal/Makefile	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/net-im/fractal/Makefile	Fri Jan  4 04:00:39 2019	(r489241)
@@ -13,7 +13,7 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # gmake for the backtrace-sys crate
-BUILD_DEPENDS=	cargo:lang/rust \
+BUILD_DEPENDS=	cargo:lang/${RUST_DEFAULT} \
 		gmake:devel/gmake
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libgmp.so:math/gmp \

Modified: head/security/kr/Makefile
==============================================================================
--- head/security/kr/Makefile	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/security/kr/Makefile	Fri Jan  4 04:00:39 2019	(r489241)
@@ -13,7 +13,7 @@ BROKEN=		fails to build
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	Uses 64bit types
 
-BUILD_DEPENDS=	rust>=1.19.0_2:lang/rust \
+BUILD_DEPENDS=	${RUST_DEFAULT}>=1.19.0_2:lang/${RUST_DEFAULT} \
 		bash>0:shells/bash
 
 USES=		gmake go shebangfix

Modified: head/security/suricata/Makefile
==============================================================================
--- head/security/suricata/Makefile	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/security/suricata/Makefile	Fri Jan  4 04:00:39 2019	(r489241)
@@ -112,7 +112,7 @@ REDIS_CONFIGURE_ON=		--enable-hiredis \
 				--with-libhiredis-includes=${LOCALBASE}/include \
 				--with-libhiredis-libraries=${LOCALBASE}/lib
 
-RUST_BUILD_DEPENDS=		rustc:lang/rust
+RUST_BUILD_DEPENDS=		rustc:lang/${RUST_DEFAULT}
 RUST_CONFIGURE_ENABLE=		rust
 
 TESTS_CONFIGURE_ENABLE=		unittests

Modified: head/www/cliqz/Makefile
==============================================================================
--- head/www/cliqz/Makefile	Fri Jan  4 01:20:56 2019	(r489240)
+++ head/www/cliqz/Makefile	Fri Jan  4 04:00:39 2019	(r489241)
@@ -44,7 +44,7 @@ BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213 \
 		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_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \
 		rust-cbindgen>=0.6.2:devel/rust-cbindgen \
 		sqlite3>=3.24.0:databases/sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \