From owner-svn-ports-all@freebsd.org Mon Jan 23 21:55:50 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C605CBDC14; Mon, 23 Jan 2017 21:55:50 +0000 (UTC) (envelope-from dumbbell@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 mx1.freebsd.org (Postfix) with ESMTPS id C2A19967; Mon, 23 Jan 2017 21:55:49 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0NLtmoS043543; Mon, 23 Jan 2017 21:55:48 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0NLtmcV043540; Mon, 23 Jan 2017 21:55:48 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201701232155.v0NLtmcV043540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Mon, 23 Jan 2017 21:55:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432293 - head/devel/cargo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 23 Jan 2017 21:55:50 -0000 Author: dumbbell Date: Mon Jan 23 21:55:48 2017 New Revision: 432293 URL: https://svnweb.freebsd.org/changeset/ports/432293 Log: devel/cargo: Fix bootstrap checksum + use ${OPENSSLBASE} Because devel/cargo and lang/rust-nightly use a different DISTFILE with the same name, the wrong checksum and size was selected in devel/cargo. To fix this, keep the parent directory (a date) in the DISTFILE name. Also, depending on the value of DEFAULT_VERSION=ssl= and whether OpenSSL from ports is installed, the openssl-sys crate could fail to build. Passing OpenSSL location to make was way too complicated anyway. So simplify it and use ${OPENSSLBASE}. This was reported in PR 216385. Bump PORTREVISION to 1. PR: 216143, 216385 Reported by: gja822@narod.ru (216385, SSL build failure) Approved by: antoine (mentor), jbeich Differential Revision: https://reviews.freebsd.org/D9295 Modified: head/devel/cargo/Makefile head/devel/cargo/distinfo.amd64 head/devel/cargo/distinfo.i386 Modified: head/devel/cargo/Makefile ============================================================================== --- head/devel/cargo/Makefile Mon Jan 23 21:52:21 2017 (r432292) +++ head/devel/cargo/Makefile Mon Jan 23 21:55:48 2017 (r432293) @@ -3,6 +3,7 @@ PORTNAME= cargo PORTVERSION= 0.15.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= dumbbell@FreeBSD.org @@ -33,7 +34,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT # This is a collection of mainly shell scripts which are used to # install Cargo. -MASTER_SITES= https://static.rust-lang.org/cargo-dist/2016-11-02/:bootstrap \ +MASTER_SITES= https://static.rust-lang.org/cargo-dist/:bootstrap \ LOCAL/dumbbell/rust:registry .if !defined(SKIP_CARGO_REGISTRY) DISTFILES+= ${CARGO_REGISTRY}:registry @@ -54,7 +55,7 @@ RUST_ARCH_x86_64= x86_64 # dragonfly RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} -CARGO_BOOT= ${PORTNAME}-nightly-${RUST_TARGET}${EXTRACT_SUFX} +CARGO_BOOT= 2016-11-02/${PORTNAME}-nightly-${RUST_TARGET}${EXTRACT_SUFX} CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz # We don't USES=cmake here, because cmake is not Cargo's build system. @@ -69,7 +70,8 @@ RUST_PORT?= lang/rust USES= gmake python:-2.7,build pkgconfig ssl HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" -MAKE_ENV= ARGS="${CARGO_ARGS}" +MAKE_ENV= ARGS="${CARGO_ARGS}" \ + OPENSSL_DIR="${OPENSSLBASE}" CARGO_ARGS= --jobs ${MAKE_JOBS_NUMBER} MAKE_ARGS+= VERBOSE=1 @@ -82,12 +84,6 @@ BOOTSTRAP_CONFIGURE_ON= --cargo="${WRKDI BOOTSTRAP_CONFIGURE_OFF=--cargo="$$(command -v cargo)" # respect PATH BOOTSTRAP_DISTFILES= ${CARGO_BOOT}:bootstrap BOOTSTRAP_MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib" -.if !exists(/usr/lib/libssl.so.8) # OPENSSL_SHLIBVER -BOOTSTRAP_VARS+= WITH_OPENSSL_PORT=yes -BOOTSTRAP_MAKE_ENV+= OPENSSL_DIR=${LOCALBASE} -.else -BOOTSTRAP_MAKE_ENV+= OPENSSL_DIR=/usr -.endif post-extract-BOOTSTRAP-on: @${MKDIR} ${WRKSRC}/target/dl Modified: head/devel/cargo/distinfo.amd64 ============================================================================== --- head/devel/cargo/distinfo.amd64 Mon Jan 23 21:52:21 2017 (r432292) +++ head/devel/cargo/distinfo.amd64 Mon Jan 23 21:55:48 2017 (r432293) @@ -1,8 +1,8 @@ TIMESTAMP = 1484954237 SHA256 (cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92 SIZE (cargo-registry-0.15.0.tar.xz) = 21559740 -SHA256 (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4d5e6203d8f6825debb99b4a9e4c8ac2177c55dd2d13458ad6fb972e947bf933 -SIZE (cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4516956 +SHA256 (2016-11-02/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4d5e6203d8f6825debb99b4a9e4c8ac2177c55dd2d13458ad6fb972e947bf933 +SIZE (2016-11-02/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4516956 SHA256 (rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64 SIZE (rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157 SHA256 (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f Modified: head/devel/cargo/distinfo.i386 ============================================================================== --- head/devel/cargo/distinfo.i386 Mon Jan 23 21:52:21 2017 (r432292) +++ head/devel/cargo/distinfo.i386 Mon Jan 23 21:55:48 2017 (r432293) @@ -1,8 +1,8 @@ TIMESTAMP = 1484954237 SHA256 (cargo-registry-0.15.0.tar.xz) = 9dcc9747b86f6e647ad429de5df854c69fb4d259c2f4619f22a02a8af6bb6d92 SIZE (cargo-registry-0.15.0.tar.xz) = 21559740 -SHA256 (cargo-nightly-i686-unknown-freebsd.tar.gz) = bfa152e787369f629294c8d85e2d6afce3730fe78bd469e2fbc3be731c795f7f -SIZE (cargo-nightly-i686-unknown-freebsd.tar.gz) = 4795563 +SHA256 (2016-11-02/cargo-nightly-i686-unknown-freebsd.tar.gz) = 417084d11dfbb0a37b19cbf8da1950a68e812d2ab60b13996f7c28c1058c8fa3 +SIZE (2016-11-02/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4427612 SHA256 (rust-lang-cargo-0.15.0_GH0.tar.gz) = 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64 SIZE (rust-lang-cargo-0.15.0_GH0.tar.gz) = 631157 SHA256 (rust-lang-rust-installer-755bc3d_GH0.tar.gz) = 103a502bad7af80eef7ccd2dd2969a272a6fa3f237ebeaca083315a45878f07f