diff --git a/devel/got/Makefile b/devel/got/Makefile index 382ebadf7ab1..ee9849a6f1bc 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,38 +1,38 @@ PORTNAME= got -DISTVERSION= 0.100 +DISTVERSION= 0.101 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/portable/ DISTNAME= got-portable-${DISTVERSION} MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system WWW= https://gameoftrees.org LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= localbase pkgconfig ssl CONFLICTS_INSTALL= p5-App-GitGot GNU_CONFIGURE= Yes # The regression test suite requires: # installed got # installed git # installed perl and HTTP::Daemon # ssh to 127.0.0.1 tests: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tests) .include # When using LibreSSL use its own libtls, but when using OpenSSL # use libtls from libretls. .if ${SSL_DEFAULT:Mlibressl*} # /* empty */ .else LIB_DEPENDS+= libtls.so:security/libretls .endif # SSL_DEFAULT .include diff --git a/devel/got/distinfo b/devel/got/distinfo index f275e36e09f9..0258cf1065fe 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717453535 -SHA256 (got-portable-0.100.tar.gz) = fc3a8a2067ff699d3d68bfeb07bb5ef806ae1e627e98e4eb5446e4a93f565012 -SIZE (got-portable-0.100.tar.gz) = 1482599 +TIMESTAMP = 1720791919 +SHA256 (got-portable-0.101.tar.gz) = 25064182c731a0cbf80e48bbeecf2d628e2be41046f84aec0d89d8e7f6a6dcc0 +SIZE (got-portable-0.101.tar.gz) = 1479135 diff --git a/devel/got/files/patch-configure b/devel/got/files/patch-configure index 16454c6bb8e5..81789b834cc0 100644 --- a/devel/got/files/patch-configure +++ b/devel/got/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig 2024-04-25 19:31:02 UTC +--- configure.orig 2024-07-12 06:21:23 UTC +++ configure -@@ -10046,9 +10046,9 @@ fi +@@ -9818,9 +9818,9 @@ fi fi -if test "x$found_libevent" = xno; then - as_fn_error $? "\"libevent not found\"" "$LINENO" 5 -fi +#if test "x$found_libevent" = xno; then +# as_fn_error $? "\"libevent not found\"" "$LINENO" 5 +#fi ac_fn_c_check_func "$LINENO" "uuid_create" "ac_cv_func_uuid_create" if test "x$ac_cv_func_uuid_create" = xyes diff --git a/devel/got/files/patch-tog_tog.c b/devel/got/files/patch-tog_tog.c new file mode 100644 index 000000000000..314b3a2c03af --- /dev/null +++ b/devel/got/files/patch-tog_tog.c @@ -0,0 +1,26 @@ +--- tog/tog.c.orig 2024-07-12 06:14:53 UTC ++++ tog/tog.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "got_version.h" + #include "got_error.h" +@@ -1720,6 +1721,15 @@ view_input(struct tog_view **new, int *done, struct to + } + + if (view->searching && !view->search_next_done) { ++ errcode = pthread_mutex_unlock(&tog_mutex); ++ if (errcode) ++ return got_error_set_errno(errcode, ++ "pthread_mutex_unlock"); ++ sched_yield(); ++ errcode = pthread_mutex_lock(&tog_mutex); ++ if (errcode) ++ return got_error_set_errno(errcode, ++ "pthread_mutex_lock"); + view->search_next(view); + return NULL; + }