From nobody Tue Nov 22 11:59:41 2022 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 4NGjVQ243Bz4hShv; Tue, 22 Nov 2022 11:59:42 +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 4NGjVQ14jZz41fH; Tue, 22 Nov 2022 11:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669118382; 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=LNEJfARY/hFBrcaQQh100QgcgusINYlDv/GKmMivHWg=; b=qO1JDLZ4mbTDMAyhAla8wefObWHCsPBDQ34TsmDylYhY2OoF9vhnb6VbAW4jLVEw6PU/1V 6jDLpaoJgjyHLGjF734VUyP5lmyRfLNFHqgKVVQvmj0Gw6DfiXTaVDJEPKSjB8goE1OscF OD1/xbKecElDW8Sx3eChizbK9ycveAOHIYcPL2UnKnMxBRFnOb5BDVhgTfEICGUYdJdgFE 3bYIIqT8dUXXJHzw9Ee6hWphgtQZXAxl67dIuMSOSNVbeNCL8rB9EDdpGcGg8G5u0Br0W7 XJAife4suTQlVViWUU8rtjetMZ0w8I7HUVB4s5/JNs1r6GiS+6xZvg3M2e4u0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669118382; 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=LNEJfARY/hFBrcaQQh100QgcgusINYlDv/GKmMivHWg=; b=KJdMtpXcA3XbgIfV4xpFMyO0xcrntdi/j3tvlNHzz+QGa6dVnQGNXq4ZYpK8vC5qOz6ftn N/EWzDjjVbWlm9fR+GTqQGj/DK4bEK/49en4Y0Hrd+GG6UoutPhlABdcuN+jND1pYBKiV4 5zdNWRmZ/ZIm0r/PGOTTH0enjim8vFoCI28JomUp1LMUHBqHfkN/NInL9PQsLL4/QtRwfN ig8NicUaoRiWm6X3fL7mQVavGKg9M9WQUy1pf8UIlXs/8SThwncDy2xNDRapkyfJq20I1N 6BQmDCUJ0e32IK0VoNtKONILt09eEBPbNETxU2S8qX4++ZaX41hRRrcPVpauqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669118382; a=rsa-sha256; cv=none; b=jeoBlDQVu/Bm9lHuoGCUbtN7C87JRIaFPNpCfMmI3ZHQZmw5NbimdsGL6hbXPQrEJkCI6P EML5OPQJIpLWdE47pHZtcrivuOrXKRl2wDt1aEc/l3XL5ODR4x8YLjbnp8wVQpM5fyr+pQ 827Q62HRoXKLJ6CQjZ7mI0WrKNh7Xpf+5wt6aHKE90mqaibTIOd3jnQFVFvROICTKVw0KD EsHe4V3BjE08vhMaXVgJKQaVMAixyx7q9IrO1Fk5xlbPXxtZywycbj53BHfC503OIlHK3x AKi4iyhtbnkWXRH4Bsj14B0rAWaYNLz4eeVumLwR05BlzAg1Ve33+KfkjnyDDA== 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 4NGjVP6rvmzhBm; Tue, 22 Nov 2022 11:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AMBxfIL056937; Tue, 22 Nov 2022 11:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AMBxffT056936; Tue, 22 Nov 2022 11:59:41 GMT (envelope-from git) Date: Tue, 22 Nov 2022 11:59:41 GMT Message-Id: <202211221159.2AMBxffT056936@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: fb0f43d17624 - main - devel/cargo-c: back to system libgit2/libssh2 after e245ebd0591a 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: fb0f43d1762455608e0166315d362f482f390c94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb0f43d1762455608e0166315d362f482f390c94 commit fb0f43d1762455608e0166315d362f482f390c94 Author: Jan Beich AuthorDate: 2022-11-22 11:56:03 +0000 Commit: Jan Beich CommitDate: 2022-11-22 11:59:39 +0000 devel/cargo-c: back to system libgit2/libssh2 after e245ebd0591a --- 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 bbc6a7da7d18..77c9eee06977 100644 --- a/devel/cargo-c/Makefile +++ b/devel/cargo-c/Makefile @@ -1,7 +1,7 @@ PORTNAME= cargo-c DISTVERSION= 0.9.14 DISTVERSIONSUFFIX= +cargo-0.66 -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.4.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