diff --git a/devel/got/Makefile b/devel/got/Makefile index ee9849a6f1bc..4dbf269dda2d 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,38 +1,38 @@ PORTNAME= got -DISTVERSION= 0.101 +DISTVERSION= 0.102 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 0258cf1065fe..a4547f57096e 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720791919 -SHA256 (got-portable-0.101.tar.gz) = 25064182c731a0cbf80e48bbeecf2d628e2be41046f84aec0d89d8e7f6a6dcc0 -SIZE (got-portable-0.101.tar.gz) = 1479135 +TIMESTAMP = 1723744874 +SHA256 (got-portable-0.102.tar.gz) = aacb50ea664b09d60be6e41ab8cb7b9c694474f90f9de19fbb7e916da6e83777 +SIZE (got-portable-0.102.tar.gz) = 1486148 diff --git a/devel/got/files/patch-tog_tog.c b/devel/got/files/patch-tog_tog.c deleted file mode 100644 index 314b3a2c03af..000000000000 --- a/devel/got/files/patch-tog_tog.c +++ /dev/null @@ -1,26 +0,0 @@ ---- 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; - }