From owner-svn-ports-all@freebsd.org Wed Apr 17 07:33:38 2019 Return-Path: Delivered-To: svn-ports-all@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 135091589027; Wed, 17 Apr 2019 07:33:38 +0000 (UTC) (envelope-from tobik@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 930086BDE1; Wed, 17 Apr 2019 07:33:37 +0000 (UTC) (envelope-from tobik@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 69CCD4069; Wed, 17 Apr 2019 07:33:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3H7XbnZ085315; Wed, 17 Apr 2019 07:33:37 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3H7XYdq085300; Wed, 17 Apr 2019 07:33:34 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904170733.x3H7XYdq085300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 17 Apr 2019 07:33:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499149 - in head: Mk/Uses databases/puppetdb-cli devel/git-absorb devel/interactive_rebase_tool devel/pijul devel/sccache security/cargo-audit sysutils/exa sysutils/flowgger textproc/b... X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: Mk/Uses databases/puppetdb-cli devel/git-absorb devel/interactive_rebase_tool devel/pijul devel/sccache security/cargo-audit sysutils/exa sysutils/flowgger textproc/bat www/websocat x11/alacr... X-SVN-Commit-Revision: 499149 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 930086BDE1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.93)[-0.929,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Apr 2019 07:33:38 -0000 Author: tobik Date: Wed Apr 17 07:33:34 2019 New Revision: 499149 URL: https://svnweb.freebsd.org/changeset/ports/499149 Log: Mk/Uses/cargo.mk: Push lib dependencies back down into ports Some crates are optional via Cargo features or are only used during tests, however the framework has no way to discriminate between test or run dependencies using just CARGO_CRATES leading to more run dependencies than necessary for some packages. With more ported Rust applications it's time to let individual ports make that decision now. The environmental setup to use dependencies from ports instead of bundled ones and implied build dependencies (cmake, gmake, pkgconf) are left in place for now. Assign cargo.mk to rust@ while here. Modified: head/Mk/Uses/cargo.mk head/databases/puppetdb-cli/Makefile head/devel/git-absorb/Makefile head/devel/interactive_rebase_tool/Makefile head/devel/pijul/Makefile head/devel/sccache/Makefile head/security/cargo-audit/Makefile head/sysutils/exa/Makefile head/sysutils/flowgger/Makefile head/textproc/bat/Makefile head/www/websocat/Makefile head/x11/alacritty/Makefile Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Wed Apr 17 07:14:22 2019 (r499148) +++ head/Mk/Uses/cargo.mk Wed Apr 17 07:33:34 2019 (r499149) @@ -7,7 +7,7 @@ # Usage: USES=cargo # Valid ARGS: none # -# MAINTAINER: ports@FreeBSD.org +# MAINTAINER: rust@FreeBSD.org .if !defined(_INCLUDE_USES_CARGO_MK) _INCLUDE_USES_CARGO_MK= yes @@ -126,12 +126,7 @@ BUILD_DEPENDS+= gmake:devel/gmake BUILD_DEPENDS+= cmake:devel/cmake .endif -.if ${CARGO_CRATES:Mfreetype-sys-[0-9]*} -LIB_DEPENDS+= libfreetype.so:print/freetype2 -.endif - .if ${CARGO_CRATES:Mgettext-sys-[0-9]*} -.include "${USESDIR}/gettext.mk" CARGO_ENV+= GETTEXT_BIN_DIR=${LOCALBASE}/bin \ GETTEXT_INCLUDE_DIR=${LOCALBASE}/include \ GETTEXT_LIB_DIR=${LOCALBASE}/lib @@ -154,13 +149,11 @@ DEV_WARNING+= "CARGO_CRATES=${libc} may be unstable on .if ${CARGO_CRATES:Mlibgit2-sys-[0-9]*} # Use the system's libgit2 instead of building the bundled version CARGO_ENV+= LIBGIT2_SYS_USE_PKG_CONFIG=1 -LIB_DEPENDS+= libgit2.so:devel/libgit2 .endif .if ${CARGO_CRATES:Mlibssh2-sys-[0-9]*} # Use the system's libssh2 instead of building the bundled version CARGO_ENV+= LIBSSH2_SYS_USE_PKG_CONFIG=1 -LIB_DEPENDS+= libssh2.so:security/libssh2 .endif .if ${CARGO_CRATES:Monig_sys-[0-9]*} @@ -170,7 +163,6 @@ LIB_DEPENDS+= libssh2.so:security/libssh2 # RUSTONIG_SYSTEM_LIBONIG is not necessary, but will force onig_sys to # always use the system's libonig as returned by `pkg-config oniguruma`. CARGO_ENV+= RUSTONIG_SYSTEM_LIBONIG=1 -LIB_DEPENDS+= libonig.so:devel/oniguruma .endif .if ${CARGO_CRATES:Mopenssl-0.[0-9].*} @@ -187,19 +179,12 @@ DEV_WARNING+= "CARGO_CRATES=openssl-0.10.3 or older do .if ${CARGO_CRATES:Mopenssl-sys-[0-9]*} # Make sure that openssl-sys can find the correct version of OpenSSL -.include "${USESDIR}/ssl.mk" CARGO_ENV+= OPENSSL_LIB_DIR=${OPENSSLLIB} \ OPENSSL_INCLUDE_DIR=${OPENSSLINC} -# Silence bogus QA warning about needing USES=ssl -QA_ENV+= USESSSL=yes .endif .if ${CARGO_CRATES:Mpkg-config-[0-9]*} .include "${USESDIR}/pkgconfig.mk" -.endif - -.if ${CARGO_CRATES:Mthrussh-libsodium-[0-9]*} -LIB_DEPENDS+= libsodium.so:security/libsodium .endif _USES_extract+= 600:cargo-extract Modified: head/databases/puppetdb-cli/Makefile ============================================================================== --- head/databases/puppetdb-cli/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/databases/puppetdb-cli/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -16,7 +16,7 @@ BROKEN_SSL_REASON_libressl= Needs an old version of O BROKEN_SSL_REASON_libressl-devel= Needs an old version of OpenSSL (older than 1.1) BROKEN_SSL_REASON_openssl111= Needs an older version of OpenSSL (older than 1.1) -USES= cargo perl5 +USES= cargo perl5 ssl USE_GITHUB= yes USE_PERL5= build Modified: head/devel/git-absorb/Makefile ============================================================================== --- head/devel/git-absorb/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/devel/git-absorb/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -11,6 +11,8 @@ COMMENT= Git command for automating fixup/autosquash c LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md +LIB_DEPENDS= libgit2.so:devel/libgit2 + USES= cargo USE_GITHUB= yes GH_ACCOUNT= tummychow Modified: head/devel/interactive_rebase_tool/Makefile ============================================================================== --- head/devel/interactive_rebase_tool/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/devel/interactive_rebase_tool/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -9,6 +9,8 @@ COMMENT= Improved sequence editor for Git LICENSE= ISCL +LIB_DEPENDS= libgit2.so:devel/libgit2 + USES= cargo ncurses USE_GITHUB= yes GH_ACCOUNT= MitMaro Modified: head/devel/pijul/Makefile ============================================================================== --- head/devel/pijul/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/devel/pijul/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -15,7 +15,9 @@ LICENSE= GPLv2 BROKEN_aarch64= fails to compile: aesv8-armx-linux64.S:53:2: instruction requires: crypto aese v6.16b,v0.16b -USES= cargo +LIB_DEPENDS= libsodium.so:security/libsodium + +USES= cargo ssl CARGO_CRATES= adler32-1.0.3 \ advapi32-sys-0.2.0 \ aho-corasick-0.6.8 \ Modified: head/devel/sccache/Makefile ============================================================================== --- head/devel/sccache/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/devel/sccache/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -11,7 +11,7 @@ COMMENT= Like ccache with cloud storage support LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo +USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= mozilla Modified: head/security/cargo-audit/Makefile ============================================================================== --- head/security/cargo-audit/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/security/cargo-audit/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -14,7 +14,10 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -USES= cargo +LIB_DEPENDS= libgit2.so:devel/libgit2 \ + libssh2.so:security/libssh2 + +USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= RustSec Modified: head/sysutils/exa/Makefile ============================================================================== --- head/sysutils/exa/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/sysutils/exa/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -12,6 +12,8 @@ COMMENT= Modern replacement for ls LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE +LIB_DEPENDS= libgit2.so:devel/libgit2 + USES= cargo USE_GITHUB= yes GH_ACCOUNT= ogham Modified: head/sysutils/flowgger/Makefile ============================================================================== --- head/sysutils/flowgger/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/sysutils/flowgger/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -12,7 +12,7 @@ COMMENT= Fast data collector LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo +USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= jedisct1 GH_TUPLE= Manishearth:rust-clippy:387efd459c0ad3db7af15f1a573057b8587f9748:clippy \ Modified: head/textproc/bat/Makefile ============================================================================== --- head/textproc/bat/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/textproc/bat/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -11,6 +11,9 @@ COMMENT= Clone of cat with syntax highlighting LICENSE= APACHE20 +LIB_DEPENDS= libgit2.so:devel/libgit2 \ + libonig.so:devel/oniguruma + USES= cargo USE_GITHUB= yes GH_ACCOUNT= sharkdp Modified: head/www/websocat/Makefile ============================================================================== --- head/www/websocat/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/www/websocat/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -13,7 +13,7 @@ COMMENT= WebSockets tools LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo +USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= vi Modified: head/x11/alacritty/Makefile ============================================================================== --- head/x11/alacritty/Makefile Wed Apr 17 07:14:22 2019 (r499148) +++ head/x11/alacritty/Makefile Wed Apr 17 07:33:34 2019 (r499149) @@ -12,9 +12,10 @@ COMMENT= GPU-accelerated terminal emulator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 -USES= cargo +USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= jwilm