From nobody Sat Nov 30 07:11:26 2024 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 4Y0h6k5Bpdz5fDkr; Sat, 30 Nov 2024 07:11:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0h6k4lxYz4sSh; Sat, 30 Nov 2024 07:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732950686; 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=FL7ZkCpccOCI1Q9t5tWMnqxg9GPTa1druOARvbDGTS4=; b=YXMksYuzRhtnrp3vRZQ7s0+12majJnvEP5C9+vkDKQV/sYLiB4VjXH7wsUMJOmJ6JltgyU 0+Y9omdQcuciKNeAyT+mcaCYqmhDItG+AGJ8uQKpmdlhyl+6GiC0/143qNgOUK2aUdb4j9 SvJlyQ9kBrts0Y/+6daTV1cGIuOdlR0Nlrtmu86MQ/0lljtX3cRB5BOD0fpMx1KcYkhjzN N7alTCr35g0g3oG8FiPU91tsF2uUL+DBNFIW9t68GC0Y+x8mYT6eO7NhzEuJvnTMaFlHVs 4iUd9yCgIPfOvvBuaLpf1OJ+UoTuiU0bL+yCcHp4V/f5dvMd8zr6YHTpQgpKtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732950686; 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=FL7ZkCpccOCI1Q9t5tWMnqxg9GPTa1druOARvbDGTS4=; b=p01UBr6Lj3IaWCvAHJlceOfy6D2W6DByihMBRZiZqz+SvU5mZsIcif/xnH2CjSluy5kBRb h3ZdOCGVJrRUyvvg3FdLrMyxADU7oi2pmQbOz9CicbWFbZ8UAaUQPFvtblt81+lQmBBblO SwkZlVgXiDVxj2GylK+XttGLothZhOGVcoQPcUzuzYAW4vi5CNos78faUPmVZt6xRrADMQ n482CSvD7EqY0GTCN+Ukvp1Hp0Pb0IKMRaOUZXj73YCzioqlE9mLnmfiOy9tgjque1MGDh gNLWBYCeOCqXCpY6uitwwU9jXzzhPjXbnOP/UiFDs9PPQQ4thySMZqst7Dxc1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732950686; a=rsa-sha256; cv=none; b=w3WdnenzSrh3FcsODlWX6Vqilsdj6JlHiAWtmqvydq3/Mo+NSkbaK1KVPiyeXPdimST/so t2vl3VJb82z2jS9RIp0wDhM0NbwzkiiD6ihv0sV/QyE5htrRMOsOgbTyoiOFjH3/2GzjID 4/Z0pNQ5aH9wWLLQd1TJfiGP9FL9ra9+KAAgzCr6hrZfBBHENKub0hNWYuCyvI6tJjCmle d+Rqu0opSz80FCAhTETUWzys4AaL4uOVXQGW9AgH5SMnNUoHRvaY6WB6JrmAVznyASuMCS 9Nd47SbvbsZ+oSd502KUDy1nM7P1jxNnjdiuLxUV5Y6HIObmBcvqCiyvVHEzSg== 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 4Y0h6k4JbRzyDc; Sat, 30 Nov 2024 07:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AU7BQNF067263; Sat, 30 Nov 2024 07:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AU7BQ7R067260; Sat, 30 Nov 2024 07:11:26 GMT (envelope-from git) Date: Sat, 30 Nov 2024 07:11:26 GMT Message-Id: <202411300711.4AU7BQ7R067260@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 8508c0c84909 - main - devel/libgit2: Fix handling for SSH option 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8508c0c84909ecd568597548e7706c7d7a85a9eb Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8508c0c84909ecd568597548e7706c7d7a85a9eb commit 8508c0c84909ecd568597548e7706c7d7a85a9eb Author: James TD Smith AuthorDate: 2024-11-25 21:19:10 +0000 Commit: Matthias Fechner CommitDate: 2024-11-30 07:00:01 +0000 devel/libgit2: Fix handling for SSH option Needs to be specified as USE_SSH=libssh2. Also remove the THREADSAFE option, this is no longer relevant. PR: 283006 --- devel/libgit2/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile index 33e94368d83f..d8b707ba5e6c 100644 --- a/devel/libgit2/Makefile +++ b/devel/libgit2/Makefile @@ -6,6 +6,7 @@ PORTNAME= libgit2 DISTVERSIONPREFIX= v DISTVERSION= 1.8.4 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -21,8 +22,6 @@ USES= cmake:testing cpe localbase pkgconfig python:build ssl USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_TESTING_ON= BUILD_TESTS - CMAKE_ARGS= -DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system \ -DCMAKE_CTEST_ARGUMENTS="-E;'invasive|online'" \ -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ @@ -30,16 +29,17 @@ CMAKE_ARGS= -DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system \ CMAKE_OFF= BUILD_TESTS +CMAKE_TESTING_ON= BUILD_TESTS + PLIST_SUB= DISTVERSION=${DISTVERSION} \ SHLIB_VER=${DISTVERSION:R} -OPTIONS_DEFINE= SSH THREADS -OPTIONS_DEFAULT=SSH THREADS +OPTIONS_DEFINE= SSH +OPTIONS_DEFAULT=SSH SSH_DESC= Enable SSH support through libssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -SSH_CMAKE_BOOL= USE_SSH -THREADS_CMAKE_BOOL= THREADSAFE +SSH_CMAKE_ON= -DUSE_SSH=libssh2 .include