From owner-svn-ports-branches@freebsd.org Sat Jan 5 00:41:59 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6E17144035F; Sat, 5 Jan 2019 00:41:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59FE88C33A; Sat, 5 Jan 2019 00:41:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3235E88FB; Sat, 5 Jan 2019 00:41:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x050fxY2068935; Sat, 5 Jan 2019 00:41:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x050fvL2068927; Sat, 5 Jan 2019 00:41:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201901050041.x050fvL2068927@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 5 Jan 2019 00:41:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489285 - in branches/2019Q1: Mk Mk/Uses devel/rust-cbindgen net-im/fractal security/kr security/suricata www/cliqz X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2019Q1: Mk Mk/Uses devel/rust-cbindgen net-im/fractal security/kr security/suricata www/cliqz X-SVN-Commit-Revision: 489285 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 59FE88C33A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jan 2019 00:42:00 -0000 Author: jbeich Date: Sat Jan 5 00:41:57 2019 New Revision: 489285 URL: https://svnweb.freebsd.org/changeset/ports/489285 Log: MFH: r489241 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) Approved by: ports-secteam (miwi) Differential Revision: https://reviews.freebsd.org/D18634 Modified: branches/2019Q1/Mk/Uses/cargo.mk branches/2019Q1/Mk/bsd.default-versions.mk branches/2019Q1/Mk/bsd.gecko.mk branches/2019Q1/devel/rust-cbindgen/Makefile branches/2019Q1/net-im/fractal/Makefile branches/2019Q1/security/kr/Makefile branches/2019Q1/security/suricata/Makefile branches/2019Q1/www/cliqz/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/Mk/Uses/cargo.mk ============================================================================== --- branches/2019Q1/Mk/Uses/cargo.mk Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/Mk/Uses/cargo.mk Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/Mk/bsd.default-versions.mk ============================================================================== --- branches/2019Q1/Mk/bsd.default-versions.mk Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/Mk/bsd.default-versions.mk Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/Mk/bsd.gecko.mk ============================================================================== --- branches/2019Q1/Mk/bsd.gecko.mk Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/Mk/bsd.gecko.mk Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/devel/rust-cbindgen/Makefile ============================================================================== --- branches/2019Q1/devel/rust-cbindgen/Makefile Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/devel/rust-cbindgen/Makefile Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/net-im/fractal/Makefile ============================================================================== --- branches/2019Q1/net-im/fractal/Makefile Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/net-im/fractal/Makefile Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/security/kr/Makefile ============================================================================== --- branches/2019Q1/security/kr/Makefile Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/security/kr/Makefile Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/security/suricata/Makefile ============================================================================== --- branches/2019Q1/security/suricata/Makefile Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/security/suricata/Makefile Sat Jan 5 00:41:57 2019 (r489285) @@ -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: branches/2019Q1/www/cliqz/Makefile ============================================================================== --- branches/2019Q1/www/cliqz/Makefile Sat Jan 5 00:38:38 2019 (r489284) +++ branches/2019Q1/www/cliqz/Makefile Sat Jan 5 00:41:57 2019 (r489285) @@ -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 \