git: 8508c0c84909 - main - devel/libgit2: Fix handling for SSH option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 07:11:26 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8508c0c84909ecd568597548e7706c7d7a85a9eb
commit 8508c0c84909ecd568597548e7706c7d7a85a9eb
Author: James TD Smith <ahktenzero@mohorovi.cc>
AuthorDate: 2024-11-25 21:19:10 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
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 <bsd.port.pre.mk>