From nobody Fri Sep 08 15:44:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj0lz5ZY5z4slQj; Fri, 8 Sep 2023 15:44:31 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj0lz58SPz4FTP; Fri, 8 Sep 2023 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694187871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqgUwEy38oTLWWJ+90BOP32yqCHJ2O0oC5WMAGVJQTk=; b=M3y+90Jc5DA3mK0var1u2/LJMVh2xVh5rbGo/B6eL8IU/ToIsLM1X5Jg/Ez7KIkLsXF5zh hOcIJAWggTKBu9mHUE920wOmhmRJOrtI4vy0lo2sQ1ZAPKdYxSog904LTwfibMIKNFXIHt M8rcsl4eMfAxqZF6+n9/yVJH2OLn3HuyPdDEU/2cJP+eLBd8sm2zvNXdQCDjrCTksR196H +2e8ed2jHALfks2xhi+0wQe7rACsZV7Xiw+8iFIgRyc07ytTk6GS2gqdqG8heZ6KxLAyq+ TzuXt5PrDWS4qEBmwVeMO2lKEmWuk6o4XXhyYp7ie3Jn+9g7ukwWSa89G6HRrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694187871; a=rsa-sha256; cv=none; b=gL+Sfm/w0jK8QrdtI+dNLbjSjvOT/UYGkxS780VEumg1dekhIzUKDoxy7HQoWLnNXuQhXt x4EZoXwhjxzEzQj/xU7YxZxpyoI5GQkKd+dTL1QHOzOJiLNfSz8jok3YcmfLdhS9Vene7K KPtkOYn7myJRU+5EQWM9cP1SA6YRGIfXd0nDqjIKLs0bjy0P0lbwveSFHtT5LgqLh5Pr2L JghmKqNMbl5pli/YTs5FOvBC4bFRBYtnIXbW3hsUUT54rIrco+Z9Mi743g6xQe9jsM2CJq VjF5qF/niebedcfc7D3cWa+oG05UFa6b7MeGPV1W8OYKIFlNilQuFoqSNU1qSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694187871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqgUwEy38oTLWWJ+90BOP32yqCHJ2O0oC5WMAGVJQTk=; b=ZzmCs6qD6ckpEgi2720r6RJte2+ceE1lmPWhLZ+l4D5iqnekt9f8IlAj8GkbO+pe3HpPxV shnGto2uo4EV8hhbS89iobeVrFMm0s/0iplJq74OFTarSbSrEHLzBvN6TT8LUDwHRHbfdc v6ef9x5WCGNb4tT1K2VbZ/p2zi2iIrpFHrrTunXWchWdqPPzJFyPCrEQwwfvi1XU4Swlaj dcv+tW/+AaT3ihcve2cpUtXkrr7S+ZeSA3GpLVqwOQKJd/S39CwBxd/bOYx7NvVxpVB7+g 54spdm/W6AjYOUeepUCHrWh8zj9PsWn1nO7l5tnX3+rdLpVKVgK6u0yf7OwV0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rj0lz48HcznVb; Fri, 8 Sep 2023 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388FiVcm092884; Fri, 8 Sep 2023 15:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388FiV6S092881; Fri, 8 Sep 2023 15:44:31 GMT (envelope-from git) Date: Fri, 8 Sep 2023 15:44:31 GMT Message-Id: <202309081544.388FiV6S092881@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 001fd50e85b9 - main - devel/cargo-c: back to system libgit2/libssh2 after f11ed4160472 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 001fd50e85b9a252a97ff7d7685530f70636fe27 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=001fd50e85b9a252a97ff7d7685530f70636fe27 commit 001fd50e85b9a252a97ff7d7685530f70636fe27 Author: Jan Beich AuthorDate: 2022-11-22 11:56:03 +0000 Commit: Jan Beich CommitDate: 2023-09-08 15:36:51 +0000 devel/cargo-c: back to system libgit2/libssh2 after f11ed4160472 --- devel/cargo-c/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/devel/cargo-c/Makefile b/devel/cargo-c/Makefile index 548d998bc03e..df6d6d36d8a7 100644 --- a/devel/cargo-c/Makefile +++ b/devel/cargo-c/Makefile @@ -1,7 +1,7 @@ PORTNAME= cargo-c DISTVERSION= 0.9.24 DISTVERSIONSUFFIX= +cargo-0.73.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default @@ -14,7 +14,9 @@ WWW= https://github.com/lu-zero/cargo-c LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libcurl.so:ftp/curl +LIB_DEPENDS= libgit2.so:devel/libgit2 \ + libcurl.so:ftp/curl \ + libssh2.so:security/libssh2 USES= cargo ssl PLIST_FILES= bin/cargo-capi \ @@ -26,10 +28,5 @@ PLIST_FILES= bin/cargo-capi \ post-patch: @${REINPLACE_CMD} -e 's,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \ ${WRKSRC}/src/install.rs -# XXX Need devel/libgit2 >= 1.6.4; libgit2 depends on libssh2, so bundle both - @${REINPLACE_CMD} 's/if try_to_use_system_libgit2/if false/' \ - ${WRKSRC}/cargo-crates/libgit2-sys-*/build.rs - @${REINPLACE_CMD} '/env::var/s/LIBSSH2.*PKG/disabled_&/' \ - ${WRKSRC}/cargo-crates/libssh2-sys-*/build.rs .include